Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-diffdir @ 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 | d997148155f2 52d8d81e72ad 4f81068ed8cd |
| rev | line source |
|---|---|
| 536 | 1 #!/bin/sh |
| 2 | |
| 3 hg init | |
| 4 touch a | |
| 5 hg add a | |
|
749
7e4843b7efd2
Update tests to use commit -m and default -u
mpm@selenic.com
parents:
536
diff
changeset
|
6 hg ci -m "a" -d "0 0" |
| 536 | 7 |
| 8 echo 123 > b | |
| 9 hg add b | |
|
800
ec85f9e6f3b1
Don't use 'set -x', fix exports, sed and hexdump usage for Solaris.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
793
diff
changeset
|
10 hg diff | sed "s/\(\(---\|+++\) [a-zA-Z0-9_/.-]*\).*/\1/" |
| 536 | 11 |
|
800
ec85f9e6f3b1
Don't use 'set -x', fix exports, sed and hexdump usage for Solaris.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
793
diff
changeset
|
12 hg diff -r tip | sed "s/\(\(---\|+++\) [a-zA-Z0-9_/.-]*\).*/\1/" |