equal
deleted
inserted
replaced
9 added 1 changesets with 1 changes to 1 files (+1 heads) |
9 added 1 changesets with 1 changes to 1 files (+1 heads) |
10 (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 |
11 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
12 (branch merge, don't forget to commit) |
12 (branch merge, don't forget to commit) |
13 C b |
13 C b |
|
14 % create test repos |
|
15 adding a |
|
16 adding b |
|
17 pulling from ../repoa |
|
18 requesting all changes |
|
19 adding changesets |
|
20 adding manifests |
|
21 adding file changes |
|
22 added 1 changesets with 1 changes to 1 files |
|
23 (run 'hg update' to get a working copy) |
|
24 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
25 pulling from ../repob |
|
26 searching for changes |
|
27 warning: repository is unrelated |
|
28 adding changesets |
|
29 adding manifests |
|
30 adding file changes |
|
31 added 1 changesets with 1 changes to 1 files (+1 heads) |
|
32 (run 'hg heads' to see heads, 'hg merge' to merge) |
|
33 % merge both repos |
|
34 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
35 (branch merge, don't forget to commit) |
|
36 % move b content |
|
37 src/b |
|
38 tst/a |