Mercurial > hg
comparison tests/test-merge6 @ 2283:e506c14382fd
deprecate 'update -m'. use 'merge' instead.
author | Vadim Gelfer <vadim.gelfer@gmail.com> |
---|---|
date | Sun, 14 May 2006 21:07:34 -0700 |
parents | 7544700fd931 |
children | ad3d5b4367cb |
comparison
equal
deleted
inserted
replaced
2282:2efa636eb411 | 2283:e506c14382fd |
---|---|
31 hg clone A1 A2 | 31 hg clone A1 A2 |
32 hg clone B1 B2 | 32 hg clone B1 B2 |
33 | 33 |
34 cd A1 | 34 cd A1 |
35 hg pull ../B1 | 35 hg pull ../B1 |
36 hg update -m | 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 |
40 | 40 |
41 cd ../B2 | 41 cd ../B2 |
42 hg pull ../A2 | 42 hg pull ../A2 |
43 hg update -m | 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 |