Mercurial > hg
view tests/test-children.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 | 7239e06e58e9 |
children |
line wrap: on
line source
% init % no working directory % setup 0 files updated, 0 files merged, 2 files removed, 0 files unresolved % hg children at revision 3 (tip) 0 files updated, 0 files merged, 1 files removed, 0 files unresolved % hg children at nullrev (should be 0 and 3) changeset: 0:4df8521a7374 user: test date: Thu Jan 01 00:00:00 1970 +0000 summary: 0 changeset: 3:e2962852269d tag: tip parent: -1:000000000000 user: test date: Thu Jan 01 00:00:03 1970 +0000 summary: 3 2 files updated, 0 files merged, 0 files removed, 0 files unresolved % hg children at revision 1 (should be 2) changeset: 2:8f5eea5023c2 user: test date: Thu Jan 01 00:00:02 1970 +0000 summary: 2 1 files updated, 0 files merged, 0 files removed, 0 files unresolved % hg children at revision 2 (other head) % hg children -r null changeset: 0:4df8521a7374 user: test date: Thu Jan 01 00:00:00 1970 +0000 summary: 0 changeset: 3:e2962852269d tag: tip parent: -1:000000000000 user: test date: Thu Jan 01 00:00:03 1970 +0000 summary: 3 % hg children -r 0 changeset: 1:708c093edef0 user: test date: Thu Jan 01 00:00:01 1970 +0000 summary: 1 % hg children -r 1 changeset: 2:8f5eea5023c2 user: test date: Thu Jan 01 00:00:02 1970 +0000 summary: 2 % hg children -r 2 % hg children -r 3 % hg children -r 0 file0 (should be 2) changeset: 2:8f5eea5023c2 user: test date: Thu Jan 01 00:00:02 1970 +0000 summary: 2 % hg children -r 1 file0 (should be 2) changeset: 2:8f5eea5023c2 user: test date: Thu Jan 01 00:00:02 1970 +0000 summary: 2 1 files updated, 0 files merged, 1 files removed, 0 files unresolved % hg children file0 at revision 0 (should be 2) changeset: 2:8f5eea5023c2 user: test date: Thu Jan 01 00:00:02 1970 +0000 summary: 2