Mercurial > hg
view tests/test-up-local-change.out @ 11715:4f9dfb54c8b5 stable
qpush --move: move the right patch even with comment lines
88fc876a4833 caused that we find the index of the moving patch in self.series
but look it up in self.full_series. The difference between these is that
full_series also contains comment lines, and we thus moved the wrong patch.
Use back self.full_series to find the moving patch, but take care of striping
the patch guard markers before comparing the patch name. Test cases have been
added for comments and empty lines in self.full_series, and for the case of
guarded patches.
Original patch contributed by Mads Kiilerich <mads@kiilerich.com>
author | Gilles Moris <gilles.moris@free.fr> |
---|---|
date | Sat, 10 Jul 2010 21:23:00 +0200 |
parents | 6f1894d6a6b0 |
children | db426935fa94 |
line wrap: on
line source
adding a updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 0 files updated, 0 files merged, 0 files removed, 0 files unresolved diff -r 33aaa84a386b a --- a/a +++ b/a @@ -1,1 +1,1 @@ -a +abc adding b M a changeset: 0:33aaa84a386b user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: 1 searching for copies back to rev 1 unmatched files in other: b resolving manifests overwrite False partial False ancestor 33aaa84a386b local 33aaa84a386b+ remote 802f095af299 a: versions differ -> m b: remote created -> g preserving a for resolve of a update: a 1/2 files (50.00%) picked tool 'true' for a (binary False symlink False) merging a my a@33aaa84a386b+ other a@802f095af299 ancestor a@33aaa84a386b update: b 2/2 files (100.00%) getting b 1 files updated, 1 files merged, 0 files removed, 0 files unresolved changeset: 1:802f095af299 tag: tip user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: 2 resolving manifests overwrite False partial False ancestor 802f095af299 local 802f095af299+ remote 33aaa84a386b a: versions differ -> m b: other deleted -> r preserving a for resolve of a update: b 1/2 files (50.00%) removing b update: a 2/2 files (100.00%) picked tool 'true' for a (binary False symlink False) merging a my a@802f095af299+ other a@33aaa84a386b ancestor a@802f095af299 0 files updated, 1 files merged, 1 files removed, 0 files unresolved changeset: 0:33aaa84a386b user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: 1 abort: there is nothing to merge - use "hg update" instead failed changeset: 0:33aaa84a386b user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: 1 searching for copies back to rev 1 unmatched files in other: b resolving manifests overwrite False partial False ancestor 33aaa84a386b local 33aaa84a386b+ remote 802f095af299 a: versions differ -> m b: remote created -> g preserving a for resolve of a update: a 1/2 files (50.00%) picked tool 'true' for a (binary False symlink False) merging a my a@33aaa84a386b+ other a@802f095af299 ancestor a@33aaa84a386b update: b 2/2 files (100.00%) getting b 1 files updated, 1 files merged, 0 files removed, 0 files unresolved changeset: 1:802f095af299 tag: tip user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: 2 changeset: 1:802f095af299 tag: tip user: test date: Mon Jan 12 13:46:40 1970 +0000 files: a b description: 2 changeset: 0:33aaa84a386b user: test date: Mon Jan 12 13:46:40 1970 +0000 files: a description: 1 diff -r 802f095af299 a --- a/a +++ b/a @@ -1,1 +1,1 @@ -a2 +abc 1 files updated, 0 files merged, 1 files removed, 0 files unresolved adding b created new head M a changeset: 1:802f095af299 user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: 2 abort: crosses branches (use 'hg merge' to merge or use 'hg update -C' to discard changes) failed abort: outstanding uncommitted changes (use 'hg status' to list changes) failed searching for copies back to rev 1 resolving manifests overwrite False partial False ancestor 33aaa84a386b local 802f095af299+ remote 030602aee63d a: versions differ -> m b: versions differ -> m preserving a for resolve of a preserving b for resolve of b update: a 1/2 files (50.00%) picked tool 'true' for a (binary False symlink False) merging a my a@802f095af299+ other a@030602aee63d ancestor a@33aaa84a386b update: b 2/2 files (100.00%) picked tool 'true' for b (binary False symlink False) merging b my b@802f095af299+ other b@030602aee63d ancestor b@000000000000 0 files updated, 2 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) changeset: 1:802f095af299 user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: 2 changeset: 2:030602aee63d tag: tip parent: 0:33aaa84a386b user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: 3 diff -r 802f095af299 a --- a/a +++ b/a @@ -1,1 +1,1 @@ -a2 +abc adding a pulling from ../a requesting all changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files 1 files updated, 0 files merged, 0 files removed, 0 files unresolved