- merge 3728:3847 in trunk.
authorDuncan Mac-Vicar P <dmacvicar@suse.de>
Wed, 2 Aug 2006 12:37:18 +0000 (12:37 +0000)
committerDuncan Mac-Vicar P <dmacvicar@suse.de>
Wed, 2 Aug 2006 12:37:18 +0000 (12:37 +0000)
commitcb4c61825b377fad46e6be61bc166da539fe4e6a
treeb395c8b4819816645581c7b35f8f444ae4c7bd95
parentadc0bd6582b38edc21fb9e2e80aa01d8070df54f
- merge 3728:3847 in trunk.
  including Michael Andres patch delta rpm nonready code
  and Klaus solver blackmagic.

If you have anything else previous to those revisions non
forwardported, please contact me for merging. I don't track
commits and I merge what it is requested to merge, with
explicit changesets (xxxx:yyyy), otherwise your code will be
lost in the branch.

I can't merge libzypp.changes for trunk, so if a changeset
includes a .changes, attach them to the changeset list so i
can append after merging. For now, .changes commited in
SLES branch and not notified for merging were lost with this
merge, as it included too much changes.
57 files changed:
devel/devel.ma/Iorder.cc [new file with mode: 0644]
devel/devel.ma/Iorder.h [deleted file]
devel/devel.ma/Makefile.am
devel/devel.ma/Test.cc
devel/devel.ma/ma_test
testsuite/solver/data.deptestomatic/patch-tests/kernel-installed.xml [new file with mode: 0644]
testsuite/solver/data.deptestomatic/patch-tests/kernel-single-update-test.xml [new file with mode: 0644]
testsuite/solver/data.deptestomatic/patch-tests/kernel-update-test.xml [new file with mode: 0644]
testsuite/solver/data.deptestomatic/patch-tests/patch-kernel1.xml [new file with mode: 0644]
testsuite/solver/data.deptestomatic/patch-tests/patch-kernel2.xml [new file with mode: 0644]
zypp/@DOXYGEN/DOXYGEN.h
zypp/AutoDispose.h [new file with mode: 0644]
zypp/CheckSum.cc
zypp/CheckSum.h
zypp/Date.h
zypp/Makefile.am
zypp/ResStatus.h
zypp/Resolver.cc
zypp/Resolver.h
zypp/TriBool.h [new file with mode: 0644]
zypp/VendorAttr.cc
zypp/ZYppCallbacks.h
zypp/base/Function.h [new file with mode: 0644]
zypp/base/Functional.h
zypp/base/LogTools.h
zypp/base/Makefile.am
zypp/detail/Makefile.am
zypp/detail/PackageImplIf.h
zypp/detail/ResolvableImpl.cc
zypp/detail/ResolvableImpl.h
zypp/parser/yum/YUMParserData.cc
zypp/parser/yum/YUMParserData.h
zypp/parser/yum/YUMPatchParser.cc
zypp/parser/yum/YUMPatchParser.h
zypp/solver/detail/Helper.cc
zypp/solver/detail/Helper.h
zypp/solver/detail/QueueItemEstablish.cc
zypp/solver/detail/QueueItemUninstall.cc
zypp/solver/detail/Resolver.cc
zypp/solver/detail/Resolver.h
zypp/solver/detail/ResolverContext.cc
zypp/solver/detail/ResolverInfo.cc
zypp/source/Applydeltarpm.cc [new file with mode: 0644]
zypp/source/Applydeltarpm.h [new file with mode: 0644]
zypp/source/Makefile.am
zypp/source/ManagedFile.h [new file with mode: 0644]
zypp/source/OnMediaLocation.cc [new file with mode: 0644]
zypp/source/OnMediaLocation.h [new file with mode: 0644]
zypp/source/PackageDelta.cc
zypp/source/PackageDelta.h
zypp/source/PackageProvider.cc [new file with mode: 0644]
zypp/source/PackageProvider.h [new file with mode: 0644]
zypp/source/SourceProvideFile.cc [new file with mode: 0644]
zypp/source/SourceProvideFile.h [new file with mode: 0644]
zypp/source/yum/YUMPackageImpl.cc
zypp/source/yum/YUMPackageImpl.h
zypp/source/yum/YUMSourceImpl.cc