Mercurial > hg
diff tests/test-up-local-change.out @ 8742:a964ab624385
merge: allow merging going backwards
New behavior is generally superior and more correct, except possibly
with regards to missing files. hg up . is now effectively a no-op,
which is probably the desired behavior for people expecting to move to
tip, but may surprise people who were expecting deleted files to
reappear.
case 1: update to .
a-w -> a-w
classic: ancestor a
missing recreated right?
rmed recreated WRONG
added forgotten WRONG
changed preserved RIGHT
conflicted can't happen
backward merge: ancestor a (NO EFFECT)
missing missing wrong?
rm'ed rm'ed RIGHT
added preserved RIGHT
changed preserved RIGHT
conflicted can't happen
case 2: update to ancestor of .
a-b-w -> b-w
\
a
classic: ancestor a
missing recreated right?
rmed recreated wrong?
added forgotten wrong?
changed preserved RIGHT
conflicted preserved wrong?
backwards merge: ancestor b
missing missing or conflict right?
rm'ed missing or conflict right?
changed preserved RIGHT
conflicted merge RIGHT
added preserved right?
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Mon, 08 Jun 2009 18:14:44 -0500 |
| parents | 60fa3371aa75 |
| children | af5f099d932b |
line wrap: on
line diff
--- a/tests/test-up-local-change.out Mon Jun 08 18:14:44 2009 -0500 +++ b/tests/test-up-local-change.out Mon Jun 08 18:14:44 2009 -0500 @@ -38,9 +38,15 @@ resolving manifests overwrite False partial False ancestor 33aaa84a386b local 802f095af299+ remote 33aaa84a386b + a: versions differ -> m b: other deleted -> r +preserving a for resolve of a removing b -0 files updated, 0 files merged, 1 files removed, 0 files unresolved +picked tool 'true' for a (binary False symlink False) +merging a +my a@802f095af299+ other a@33aaa84a386b ancestor a@33aaa84a386b + premerge successful +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