Mercurial > hg
comparison tests/test-merge6 @ 3736:ad3d5b4367cb
make manifest friendlier
switch to using context code
..which uses first parent by default
show file hashes only with debug switch
show permissions with verbose
fix up tests
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Thu, 30 Nov 2006 22:38:48 -0600 |
| parents | e506c14382fd |
| children | a74586023196 |
comparison
equal
deleted
inserted
replaced
| 3735:205f0fd4a4a1 | 3736:ad3d5b4367cb |
|---|---|
| 34 cd A1 | 34 cd A1 |
| 35 hg pull ../B1 | 35 hg pull ../B1 |
| 36 hg merge | 36 hg merge |
| 37 hg commit -m "commit test" -d "1000000 0" | 37 hg commit -m "commit test" -d "1000000 0" |
| 38 echo bar should remain deleted. | 38 echo bar should remain deleted. |
| 39 hg manifest | 39 hg manifest --debug |
| 40 | 40 |
| 41 cd ../B2 | 41 cd ../B2 |
| 42 hg pull ../A2 | 42 hg pull ../A2 |
| 43 hg merge | 43 hg merge |
| 44 hg commit -m "commit test" -d "1000000 0" | 44 hg commit -m "commit test" -d "1000000 0" |
| 45 echo bar should remain deleted. | 45 echo bar should remain deleted. |
| 46 hg manifest | 46 hg manifest --debug |