equal
deleted
inserted
replaced
25 + hg pull ../B1 |
25 + hg pull ../B1 |
26 pulling from ../B1 |
26 pulling from ../B1 |
27 searching for changes |
27 searching for changes |
28 adding changesets |
28 adding changesets |
29 adding manifests |
29 adding manifests |
30 adding file revisions |
30 adding file changes |
31 modified 1 files, added 1 changesets and 1 new revisions |
31 added 1 changesets with 1 changes to 1 files |
32 (run 'hg update' to get a working copy) |
32 (run 'hg update' to get a working copy) |
33 + hg update -m |
33 + hg update -m |
34 + hg commit -m 'commit test' -d '0 0' |
34 + hg commit -m 'commit test' -d '0 0' |
35 + echo bar should remain deleted. |
35 + echo bar should remain deleted. |
36 bar should remain deleted. |
36 bar should remain deleted. |
40 + hg pull ../A2 |
40 + hg pull ../A2 |
41 pulling from ../A2 |
41 pulling from ../A2 |
42 searching for changes |
42 searching for changes |
43 adding changesets |
43 adding changesets |
44 adding manifests |
44 adding manifests |
45 adding file revisions |
45 adding file changes |
46 modified 0 files, added 1 changesets and 0 new revisions |
46 added 1 changesets with 0 changes to 0 files |
47 (run 'hg update' to get a working copy) |
47 (run 'hg update' to get a working copy) |
48 + hg update -m |
48 + hg update -m |
49 + hg commit -m 'commit test' -d '0 0' |
49 + hg commit -m 'commit test' -d '0 0' |
50 + echo bar should remain deleted. |
50 + echo bar should remain deleted. |
51 bar should remain deleted. |
51 bar should remain deleted. |