Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-tags.out @ 862:d70c1c31fd45
Fix 3-way-merge of original parent, workdir and new parent.
The dirstate has to match what is in the repository (what would be
checked out with 'hg update -C'), because the resulting file may be
identical to the new parent, or it may be completely different.
Previously the dirstate wasn't updated, so if you changed the file to
look like the original parent, it might be considered unmodified
relative to the new parent.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Wed, 10 Aug 2005 06:47:46 +0100 |
parents | 0902ffece4b4 |
children | 5a034646e472 |
rev | line source |
---|---|
345 | 1 + hg init |
2 + hg id | |
3 unknown | |
4 + hg add a | |
801
1f9ec150a476
Updated output of tests.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
749
diff
changeset
|
5 + hg commit -m test -d 0 0 |
345 | 6 + hg co |
7 + hg identify | |
374
f07d00fcd281
update tests to reflect new short hash length
mpm@selenic.com
parents:
345
diff
changeset
|
8 acb14030fe0a tip |
801
1f9ec150a476
Updated output of tests.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
749
diff
changeset
|
9 + hg -q tip |
345 | 10 acb14030fe0a21b60322c440ad2d20cf7685a376 first |
11 + hg add .hgtags | |
801
1f9ec150a476
Updated output of tests.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
749
diff
changeset
|
12 + hg commit -m add tags -d 0 0 |
345 | 13 + hg tags |
801
1f9ec150a476
Updated output of tests.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
749
diff
changeset
|
14 tip 1:b53d0e1f3043ecbccf1b9ad2cea562c1b50462b2 |
345 | 15 first 0:acb14030fe0a21b60322c440ad2d20cf7685a376 |
801
1f9ec150a476
Updated output of tests.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
749
diff
changeset
|
16 hg -q tip ?:? |
345 | 17 + hg identify |
801
1f9ec150a476
Updated output of tests.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
749
diff
changeset
|
18 b53d0e1f3043 tip |
345 | 19 + hg status |
748 | 20 M a |
345 | 21 + hg identify |
801
1f9ec150a476
Updated output of tests.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
749
diff
changeset
|
22 b53d0e1f3043+ tip |
345 | 23 + hg co first |
24 + hg id | |
374
f07d00fcd281
update tests to reflect new short hash length
mpm@selenic.com
parents:
345
diff
changeset
|
25 acb14030fe0a+ first |
345 | 26 + hg -v id |
27 acb14030fe0a21b60322c440ad2d20cf7685a376+ first | |
28 + hg status | |
748 | 29 M a |
345 | 30 + hg add b |
801
1f9ec150a476
Updated output of tests.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
749
diff
changeset
|
31 + hg commit -m branch -d 0 0 |
345 | 32 + hg id |
374
f07d00fcd281
update tests to reflect new short hash length
mpm@selenic.com
parents:
345
diff
changeset
|
33 c8edf04160c7 tip |
345 | 34 + hg co -m 1 |
35 + hg id | |
801
1f9ec150a476
Updated output of tests.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
749
diff
changeset
|
36 c8edf04160c7+b53d0e1f3043+ tip |
345 | 37 + hg status |
748 | 38 M .hgtags |
39 M a |