equal
deleted
inserted
replaced
179 committing changelog |
179 committing changelog |
180 grafting 5:97f8bfe72746 "5" |
180 grafting 5:97f8bfe72746 "5" |
181 searching for copies back to rev 1 |
181 searching for copies back to rev 1 |
182 unmatched files in other (from topological common ancestor): |
182 unmatched files in other (from topological common ancestor): |
183 c |
183 c |
184 all copies found (* = to merge, ! = divergent, % = renamed and deleted): |
|
185 src: 'c' -> dst: 'b' * |
|
186 checking for directory renames |
|
187 resolving manifests |
184 resolving manifests |
188 branchmerge: True, force: True, partial: False |
185 branchmerge: True, force: True, partial: False |
189 ancestor: 4c60f11aa304, local: 6b9e5368ca4e+, remote: 97f8bfe72746 |
186 ancestor: 4c60f11aa304, local: 6b9e5368ca4e+, remote: 97f8bfe72746 |
190 e: remote is newer -> g |
187 e: remote is newer -> g |
191 getting e |
188 getting e |
198 scanning for duplicate grafts |
195 scanning for duplicate grafts |
199 grafting 4:9c233e8e184d "4" |
196 grafting 4:9c233e8e184d "4" |
200 searching for copies back to rev 1 |
197 searching for copies back to rev 1 |
201 unmatched files in other (from topological common ancestor): |
198 unmatched files in other (from topological common ancestor): |
202 c |
199 c |
203 all copies found (* = to merge, ! = divergent, % = renamed and deleted): |
|
204 src: 'c' -> dst: 'b' * |
|
205 checking for directory renames |
|
206 resolving manifests |
200 resolving manifests |
207 branchmerge: True, force: True, partial: False |
201 branchmerge: True, force: True, partial: False |
208 ancestor: 4c60f11aa304, local: 1905859650ec+, remote: 9c233e8e184d |
202 ancestor: 4c60f11aa304, local: 1905859650ec+, remote: 9c233e8e184d |
209 preserving e for resolve of e |
203 preserving e for resolve of e |
210 d: remote is newer -> g |
204 d: remote is newer -> g |
1278 @@ -0,0 +1,1 @@ |
1272 @@ -0,0 +1,1 @@ |
1279 +c5a |
1273 +c5a |
1280 |
1274 |
1281 $ hg cat f2c |
1275 $ hg cat f2c |
1282 c2e |
1276 c2e |
|
1277 |
|
1278 Check superfluous filemerge of files renamed in the past but untouched by graft |
|
1279 |
|
1280 $ echo a > a |
|
1281 $ hg ci -qAma |
|
1282 $ hg mv a b |
|
1283 $ echo b > b |
|
1284 $ hg ci -qAmb |
|
1285 $ echo c > c |
|
1286 $ hg ci -qAmc |
|
1287 $ hg up -q .~2 |
|
1288 $ hg graft tip -qt:fail |