Mercurial > hg
view tests/test-mq-qclone-http.out @ 12046:8e7960feb139 stable
Fix merge-tools.checkconflicts
re.match only looks at the beginning of the merged file, and without
re.MULTILINE the file had to end with ">>>>>>> something".
Now conflict markers inside the file are found, too.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Thu, 26 Aug 2010 17:38:43 +0200 |
parents | 662b0f9eb148 |
children |
line wrap: on
line source
adding a adding b [mq]: b.patch a b.patch % test with recursive collection 200 Script output follows /a/ /a/.hg/patches/ requesting all changes adding changesets adding manifests adding file changes added 2 changesets with 2 changes to 2 files requesting all changes adding changesets adding manifests adding file changes added 1 changesets with 3 changes to 3 files updating to branch default 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved a applying b.patch now at: b.patch imported patch b.patch a % test with normal collection 200 Script output follows /a/ /a/.hg/patches/ requesting all changes adding changesets adding manifests adding file changes added 2 changesets with 2 changes to 2 files requesting all changes adding changesets adding manifests adding file changes added 1 changesets with 3 changes to 3 files updating to branch default 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved a applying b.patch now at: b.patch imported patch b.patch a % test with old-style collection 200 Script output follows /a/ /a/.hg/patches/ requesting all changes adding changesets adding manifests adding file changes added 2 changesets with 2 changes to 2 files requesting all changes adding changesets adding manifests adding file changes added 1 changesets with 3 changes to 3 files updating to branch default 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved a applying b.patch now at: b.patch imported patch b.patch a % test --mq works and uses correct repository config comparing with http://localhost:$HGPORT2/a/.hg/patches searching for changes no changes found 0 b.patch