Mercurial > hg > mercurial-crew-with-dirclash
comparison tests/test-merge-local @ 3869:ad6f34c83c3d
Add instructions how to redo/finish failed merge with local working directory.
b2ae81a7df29 already implemented this for branch merges.
| author | Thomas Arendsen Hein <thomas@intevation.de> |
|---|---|
| date | Mon, 11 Dec 2006 18:09:52 +0100 |
| parents | |
| children | 46280c004f22 |
comparison
equal
deleted
inserted
replaced
| 3868:6033d9f28052 | 3869:ad6f34c83c3d |
|---|---|
| 1 #!/bin/sh | |
| 2 | |
| 3 hg init | |
| 4 | |
| 5 echo "# revision 0" | |
| 6 echo "unchanged" > unchanged | |
| 7 echo "remove me" > remove | |
| 8 echo "copy me" > copy | |
| 9 echo "move me" > move | |
| 10 for i in 1 2 3 4 5 6 7 8 9; do | |
| 11 echo "merge ok $i" >> zzz1_merge_ok | |
| 12 done | |
| 13 echo "merge bad" > zzz2_merge_bad | |
| 14 hg ci -Am "revision 0" -d "1000000 0" | |
| 15 | |
| 16 echo "# revision 1" | |
| 17 hg rm remove | |
| 18 hg mv move moved | |
| 19 hg cp copy copied | |
| 20 echo "added" > added | |
| 21 hg add added | |
| 22 echo "new first line" > zzz1_merge_ok | |
| 23 hg cat zzz1_merge_ok >> zzz1_merge_ok | |
| 24 echo "new last line" >> zzz2_merge_bad | |
| 25 hg ci -m "revision 1" -d "1000000 0" | |
| 26 | |
| 27 echo "# local changes to revision 0" | |
| 28 hg co 0 | |
| 29 echo "new last line" >> zzz1_merge_ok | |
| 30 echo "another last line" >> zzz2_merge_bad | |
| 31 hg diff --nodates | grep "^[+-][^<>]" | |
| 32 hg st | |
| 33 | |
| 34 echo "# local merge with bad merge tool" | |
| 35 HGMERGE=false hg co | |
| 36 hg co 0 | |
| 37 hg diff --nodates | grep "^[+-][^<>]" | |
| 38 hg st | |
| 39 | |
| 40 echo "# local merge with conflicts" | |
| 41 HGMERGE=merge hg co | |
| 42 hg co 0 | |
| 43 hg diff --nodates | grep "^[+-][^<>]" | |
| 44 hg st | |
| 45 | |
| 46 echo "# local merge without conflicts" | |
| 47 hg revert zzz2_merge_bad | |
| 48 HGMERGE=merge hg co | |
| 49 hg diff --nodates | grep "^[+-][^<>]" | |
| 50 hg st |