| commit | 4ad9381e0310010a94a03ea1b6cc3f383ba50ab1 | |
| author | Thomas Leonard <talex5@gmail.com> | |
| Sat, 17 Nov 2007 12:37:13 +0000 (17 12:37 +0000) | ||
| committer | Thomas Leonard <talex5@gmail.com> | |
| Sat, 17 Nov 2007 12:37:13 +0000 (17 12:37 +0000) | ||
| tree | 6163879db045b7b913be306c255d6c5217864345 | treesnapshot (tar.gz zip) |
| parent | 3458e3f24d1ebebcef2dbf54df23ebc01f6ed266 | commitdiff |
More tests for merging.
Don't merge groups if their requirements differ.
Use the closest acceptable group, not just any acceptable one.
git-svn-id: file:///home/talex/Backups/sf.net/Subversion/zero-install/trunk/0publish@2082 9f8c893c-44ee-0310-b757-c8ca8341c71e
Don't merge groups if their requirements differ.
Use the closest acceptable group, not just any acceptable one.
git-svn-id: file:///home/talex/Backups/sf.net/Subversion/zero-install/trunk/0publish@2082 9f8c893c-44ee-0310-b757-c8ca8341c71e
| merge.py | diffblobblamehistory | |
| tests/testlocal.py | diffblobblamehistory |