Mercurial > public > mercurial-scm > hg
diff tests/test-rename-merge2.t @ 26957:d16d73173fdd
merge: move messages about possible conflicts a litte earlier
I actually wanted to reduce the amount of code around the call to
applyupdates(), so I tried moving these warnings a little earlier, and
I think it makes the output make a little more sense (see changes to
test cases).
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Thu, 12 Nov 2015 13:14:03 -0800 |
| parents | 8e6d5b7317e6 |
| children | 9f3410a52f44 |
line wrap: on
line diff
--- a/tests/test-rename-merge2.t Sun Nov 01 15:46:06 2015 +0900 +++ b/tests/test-rename-merge2.t Thu Nov 12 13:14:03 2015 -0800 @@ -411,6 +411,9 @@ resolving manifests branchmerge: True, force: False, partial: False ancestor: 924404dff337, local: 02963e448370+, remote: fe905ef2c33e + note: possible conflict - a was renamed multiple times to: + b + c preserving rev for resolve of rev c: remote created -> g getting c @@ -423,9 +426,6 @@ my rev@02963e448370+ other rev@fe905ef2c33e ancestor rev@924404dff337 launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob) merge tool returned: 0 - note: possible conflict - a was renamed multiple times to: - b - c 1 files updated, 1 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) --------------