equal
deleted
inserted
replaced
9 adding a/b |
9 adding a/b |
10 |
10 |
11 $ hg co -C 0 |
11 $ hg co -C 0 |
12 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
12 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
13 $ hg mv a b |
13 $ hg mv a b |
14 moving a/a to b/a |
14 moving a/a to b/a (glob) |
15 moving a/b to b/b |
15 moving a/b to b/b (glob) |
16 $ hg ci -m "1 mv a/ b/" |
16 $ hg ci -m "1 mv a/ b/" |
17 |
17 |
18 $ hg co -C 0 |
18 $ hg co -C 0 |
19 2 files updated, 0 files merged, 2 files removed, 0 files unresolved |
19 2 files updated, 0 files merged, 2 files removed, 0 files unresolved |
20 $ echo baz > a/c |
20 $ echo baz > a/c |
73 R a/b |
73 R a/b |
74 R a/c |
74 R a/c |
75 ? b/d |
75 ? b/d |
76 $ hg ci -m "3 merge 2+1" |
76 $ hg ci -m "3 merge 2+1" |
77 $ hg debugrename b/c |
77 $ hg debugrename b/c |
78 b/c renamed from a/c:354ae8da6e890359ef49ade27b68bbc361f3ca88 |
78 b/c renamed from a/c:354ae8da6e890359ef49ade27b68bbc361f3ca88 (glob) |
79 |
79 |
80 $ hg co -C 1 |
80 $ hg co -C 1 |
81 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
81 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
82 $ hg merge --debug 2 |
82 $ hg merge --debug 2 |
83 searching for copies back to rev 1 |
83 searching for copies back to rev 1 |
109 a/c |
109 a/c |
110 ? b/d |
110 ? b/d |
111 $ hg ci -m "4 merge 1+2" |
111 $ hg ci -m "4 merge 1+2" |
112 created new head |
112 created new head |
113 $ hg debugrename b/c |
113 $ hg debugrename b/c |
114 b/c renamed from a/c:354ae8da6e890359ef49ade27b68bbc361f3ca88 |
114 b/c renamed from a/c:354ae8da6e890359ef49ade27b68bbc361f3ca88 (glob) |
115 |
115 |
116 |
116 |
117 Second scenario with two repos: |
117 Second scenario with two repos: |
118 |
118 |
119 $ cd .. |
119 $ cd .. |
120 $ hg init r1 |
120 $ hg init r1 |
121 $ cd r1 |
121 $ cd r1 |
122 $ mkdir a |
122 $ mkdir a |
123 $ echo foo > a/f |
123 $ echo foo > a/f |
124 $ hg add a |
124 $ hg add a |
125 adding a/f |
125 adding a/f (glob) |
126 $ hg ci -m "a/f == foo" |
126 $ hg ci -m "a/f == foo" |
127 $ cd .. |
127 $ cd .. |
128 |
128 |
129 $ hg clone r1 r2 |
129 $ hg clone r1 r2 |
130 updating to branch default |
130 updating to branch default |
131 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
131 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
132 $ cd r2 |
132 $ cd r2 |
133 $ hg mv a b |
133 $ hg mv a b |
134 moving a/f to b/f |
134 moving a/f to b/f (glob) |
135 $ echo foo1 > b/f |
135 $ echo foo1 > b/f |
136 $ hg ci -m" a -> b, b/f == foo1" |
136 $ hg ci -m" a -> b, b/f == foo1" |
137 $ cd .. |
137 $ cd .. |
138 |
138 |
139 $ cd r1 |
139 $ cd r1 |
140 $ mkdir a/aa |
140 $ mkdir a/aa |
141 $ echo bar > a/aa/g |
141 $ echo bar > a/aa/g |
142 $ hg add a/aa |
142 $ hg add a/aa |
143 adding a/aa/g |
143 adding a/aa/g (glob) |
144 $ hg ci -m "a/aa/g" |
144 $ hg ci -m "a/aa/g" |
145 $ hg pull ../r2 |
145 $ hg pull ../r2 |
146 pulling from ../r2 |
146 pulling from ../r2 |
147 searching for changes |
147 searching for changes |
148 adding changesets |
148 adding changesets |