|
1 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
2 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
3 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1 pulling from ../B1 |
4 pulling from ../B1 |
2 searching for changes |
5 searching for changes |
3 adding changesets |
6 adding changesets |
4 adding manifests |
7 adding manifests |
5 adding file changes |
8 adding file changes |
6 added 1 changesets with 1 changes to 1 files (+1 heads) |
9 added 1 changesets with 1 changes to 1 files (+1 heads) |
7 (run 'hg heads' to see heads, 'hg merge' to merge) |
10 (run 'hg heads' to see heads, 'hg merge' to merge) |
|
11 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
12 (branch merge, don't forget to commit) |
8 bar should remain deleted. |
13 bar should remain deleted. |
9 f9b0e817f6a48de3564c6b2957687c5e7297c5a0 644 foo |
14 f9b0e817f6a48de3564c6b2957687c5e7297c5a0 644 foo |
10 pulling from ../A2 |
15 pulling from ../A2 |
11 searching for changes |
16 searching for changes |
12 adding changesets |
17 adding changesets |
13 adding manifests |
18 adding manifests |
14 adding file changes |
19 adding file changes |
15 added 1 changesets with 0 changes to 0 files (+1 heads) |
20 added 1 changesets with 0 changes to 0 files (+1 heads) |
16 (run 'hg heads' to see heads, 'hg merge' to merge) |
21 (run 'hg heads' to see heads, 'hg merge' to merge) |
|
22 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
23 (branch merge, don't forget to commit) |
17 bar should remain deleted. |
24 bar should remain deleted. |
18 f9b0e817f6a48de3564c6b2957687c5e7297c5a0 644 foo |
25 f9b0e817f6a48de3564c6b2957687c5e7297c5a0 644 foo |