equal
deleted
inserted
replaced
20 requesting all changes |
20 requesting all changes |
21 adding changesets |
21 adding changesets |
22 adding manifests |
22 adding manifests |
23 adding file changes |
23 adding file changes |
24 added 1 changesets with 1 changes to 1 files (+1 heads) |
24 added 1 changesets with 1 changes to 1 files (+1 heads) |
|
25 new changesets cb9a9f314b8b |
25 (run 'hg heads' to see heads, 'hg merge' to merge) |
26 (run 'hg heads' to see heads, 'hg merge' to merge) |
26 $ hg merge |
27 $ hg merge |
27 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
28 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
28 (branch merge, don't forget to commit) |
29 (branch merge, don't forget to commit) |
29 $ hg rm -f a |
30 $ hg rm -f a |
55 requesting all changes |
56 requesting all changes |
56 adding changesets |
57 adding changesets |
57 adding manifests |
58 adding manifests |
58 adding file changes |
59 adding file changes |
59 added 1 changesets with 1 changes to 1 files |
60 added 1 changesets with 1 changes to 1 files |
|
61 new changesets 7132ab4568ac |
60 (run 'hg update' to get a working copy) |
62 (run 'hg update' to get a working copy) |
61 $ hg update |
63 $ hg update |
62 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
64 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
63 $ mkdir tst |
65 $ mkdir tst |
64 $ hg mv * tst |
66 $ hg mv * tst |
70 requesting all changes |
72 requesting all changes |
71 adding changesets |
73 adding changesets |
72 adding manifests |
74 adding manifests |
73 adding file changes |
75 adding file changes |
74 added 1 changesets with 1 changes to 1 files (+1 heads) |
76 added 1 changesets with 1 changes to 1 files (+1 heads) |
|
77 new changesets 5ddceb349652 |
75 (run 'hg heads' to see heads, 'hg merge' to merge) |
78 (run 'hg heads' to see heads, 'hg merge' to merge) |
76 |
79 |
77 merge both repos |
80 merge both repos |
78 |
81 |
79 $ hg merge |
82 $ hg merge |