Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-flags @ 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 | 7d83a351a936 |
| rev | line source |
|---|---|
|
800
ec85f9e6f3b1
Don't use 'set -x', fix exports, sed and hexdump usage for Solaris.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
749
diff
changeset
|
1 #!/bin/sh -e |
| 412 | 2 |
|
491
66eb9905d0a2
Fixed test-flags and .out for arbitrary umask settings. Use -ex shell flags.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
440
diff
changeset
|
3 umask 027 |
| 412 | 4 mkdir test1 |
| 5 cd test1 | |
| 6 | |
| 7 hg init | |
| 8 touch a b | |
| 9 hg add a b | |
|
749
7e4843b7efd2
Update tests to use commit -m and default -u
mpm@selenic.com
parents:
591
diff
changeset
|
10 hg ci -m "added a b" -d "0 0" |
| 412 | 11 |
| 12 cd .. | |
| 13 mkdir test2 | |
| 14 cd test2 | |
| 15 | |
| 16 hg init | |
| 440 | 17 hg pull ../test1 |
| 412 | 18 hg co |
| 19 chmod +x a | |
|
749
7e4843b7efd2
Update tests to use commit -m and default -u
mpm@selenic.com
parents:
591
diff
changeset
|
20 hg ci -m "chmod +x a" -d "0 0" |
| 412 | 21 |
| 22 cd ../test1 | |
| 23 echo 123 >>a | |
|
749
7e4843b7efd2
Update tests to use commit -m and default -u
mpm@selenic.com
parents:
591
diff
changeset
|
24 hg ci -m "a updated" -d "0 0" |
| 412 | 25 |
| 440 | 26 hg pull ../test2 |
| 412 | 27 hg heads |
| 28 hg history | |
| 29 | |
| 591 | 30 hg -v co -m |
| 412 | 31 |
| 32 ls -l ../test[12]/a > foo | |
| 33 cut -b 0-10 < foo | |
| 34 |