Mercurial > hg
annotate tests/test-convert-darcs.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 | f29b7c8419cb |
children | b236f34ec1e9 |
rev | line source |
---|---|
5413 | 1 % initialize darcs repo |
2 Finished recording patch 'p0' | |
3 % branch and update | |
4 Finished recording patch 'p1.1' | |
5 % update source | |
6 Finished recording patch 'p1.2' | |
7 % merge branch | |
8 We have conflicts in the following files: | |
9 ./a | |
10 Finished pulling and applying. | |
11 Finished recording patch 'p2' | |
12 initializing destination darcs-repo-hg repository | |
13 scanning source... | |
14 sorting... | |
15 converting... | |
16 3 p0 | |
17 2 p1.2 | |
18 1 p1.1 | |
19 0 p2 | |
20 o 3 "p2" files: a | |
21 | | |
22 o 2 "p1.1" files: | |
23 | | |
24 o 1 "p1.2" files: a b | |
25 | | |
26 o 0 "p0" files: a | |
27 | |
28 7225b30cdf38257d5cc7780772c051b6f33e6d6b 644 a | |
29 1e88685f5ddec574a34c70af492f95b6debc8741 644 b |