Mercurial > evolve
changeset 533:87c41ef95ebf stable
test conflicting conflicting (sic) resolution
| author | Pierre-Yves David <pierre-yves.david@logilab.fr> |
|---|---|
| date | Thu, 30 Aug 2012 13:50:17 +0200 |
| parents | 744db7a27dd0 |
| children | 45ccaba212f9 |
| files | hgext/evolve.py tests/test-stabilize-result.t |
| diffstat | 2 files changed, 31 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/evolve.py Wed Aug 29 11:58:21 2012 +0200 +++ b/hgext/evolve.py Thu Aug 30 13:50:17 2012 +0200 @@ -1546,7 +1546,7 @@ displayer.show(base) if dryrun: ui.write('hg update -c %s &&\n' % conflicting) - ui.write('hg merge %s && \n' % other) + ui.write('hg merge %s &&\n' % other) ui.write('hg commit -m "auto merge resolving conflict between ' '%s and %s"&&\n' % (conflicting, other)) ui.write('hg up -C %s &&\n' % base)
--- a/tests/test-stabilize-result.t Wed Aug 29 11:58:21 2012 +0200 +++ b/tests/test-stabilize-result.t Thu Aug 30 13:50:17 2012 +0200 @@ -231,7 +231,7 @@ $ hg evolve -qn hg update -c 3883461cc228 && - hg merge 4754d61bc2db && + hg merge 4754d61bc2db && hg commit -m "auto merge resolving conflict between 3883461cc228 and 4754d61bc2db"&& hg up -C 7391601a4bfa && hg revert --all --rev tip && @@ -288,3 +288,32 @@ +less +conflict +babar + +Check conflicting during conflicting resolution +------------------------------------------------- + + $ hg up 15 + 1 files updated, 0 files merged, 0 files removed, 0 files unresolved + Working directory parent is obsolete + $ echo 'gotta break' >> a + $ hg amend + 1 new conflicting changesets + $ hg evolve -qn + hg update -c c956a4b140b6 && + hg merge ac6d600735a4 && + hg commit -m "auto merge resolving conflict between c956a4b140b6 and ac6d600735a4"&& + hg up -C 7391601a4bfa && + hg revert --all --rev tip && + hg commit -m "`hg log -r c956a4b140b6 --template={desc}`"; + $ hg evolve + merge:[24] More addition + with: [22] More addition + base: [15] More addition + merging a + warning: conflicts during merge. + merging a incomplete! (edit conflicts, then use 'hg resolve --mark') + 0 files updated, 0 files merged, 0 files removed, 1 files unresolved + use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon + abort: GASP! Merge Conflict! You are on you own chap! + (/!\ hg evolve --continue will NOT work /!\) + [255]