Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-tags @ 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 |
|---|---|
|
544
3d4d5f2aba9a
Remove bashisms and use /bin/sh instead of /bin/bash.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
345
diff
changeset
|
1 #!/bin/sh |
| 345 | 2 |
| 3 mkdir t | |
| 4 cd t | |
| 5 hg init | |
| 6 hg id | |
| 7 echo a > a | |
| 8 hg add a | |
|
749
7e4843b7efd2
Update tests to use commit -m and default -u
mpm@selenic.com
parents:
547
diff
changeset
|
9 hg commit -m "test" -d "0 0" |
| 345 | 10 hg co |
| 11 hg identify | |
| 12 T=`hg -q tip | cut -d : -f 2` | |
| 13 echo "$T first" > .hgtags | |
| 14 cat .hgtags | |
| 15 hg add .hgtags | |
|
749
7e4843b7efd2
Update tests to use commit -m and default -u
mpm@selenic.com
parents:
547
diff
changeset
|
16 hg commit -m "add tags" -d "0 0" |
| 345 | 17 hg tags |
| 18 hg identify | |
| 19 echo bb > a | |
| 20 hg status | |
| 21 hg identify | |
| 22 hg co first | |
| 23 hg id | |
| 24 hg -v id | |
| 25 hg status | |
| 26 echo 1 > b | |
| 27 hg add b | |
|
749
7e4843b7efd2
Update tests to use commit -m and default -u
mpm@selenic.com
parents:
547
diff
changeset
|
28 hg commit -m "branch" -d "0 0" |
| 345 | 29 hg id |
| 30 hg co -m 1 | |
| 31 hg id | |
| 32 hg status | |
| 33 |