equal
deleted
inserted
replaced
221 b |
221 b |
222 committing manifest |
222 committing manifest |
223 committing changelog |
223 committing changelog |
224 updating the branch cache |
224 updating the branch cache |
225 grafting 5:97f8bfe72746 "5" |
225 grafting 5:97f8bfe72746 "5" |
226 all copies found (* = to merge, ! = divergent, % = renamed and deleted): |
|
227 on local side: |
|
228 src: 'c' -> dst: 'b' |
|
229 checking for directory renames |
|
230 resolving manifests |
226 resolving manifests |
231 branchmerge: True, force: True, partial: False |
227 branchmerge: True, force: True, partial: False |
232 ancestor: 4c60f11aa304, local: 6b9e5368ca4e+, remote: 97f8bfe72746 |
228 ancestor: 4c60f11aa304, local: 6b9e5368ca4e+, remote: 97f8bfe72746 |
233 e: remote is newer -> g |
229 e: remote is newer -> g |
234 getting e |
230 getting e |
238 committing changelog |
234 committing changelog |
239 updating the branch cache |
235 updating the branch cache |
240 $ HGEDITOR=cat hg graft 4 3 --log --debug |
236 $ HGEDITOR=cat hg graft 4 3 --log --debug |
241 scanning for duplicate grafts |
237 scanning for duplicate grafts |
242 grafting 4:9c233e8e184d "4" |
238 grafting 4:9c233e8e184d "4" |
243 all copies found (* = to merge, ! = divergent, % = renamed and deleted): |
|
244 on local side: |
|
245 src: 'c' -> dst: 'b' |
|
246 checking for directory renames |
|
247 resolving manifests |
239 resolving manifests |
248 branchmerge: True, force: True, partial: False |
240 branchmerge: True, force: True, partial: False |
249 ancestor: 4c60f11aa304, local: 1905859650ec+, remote: 9c233e8e184d |
241 ancestor: 4c60f11aa304, local: 1905859650ec+, remote: 9c233e8e184d |
250 d: remote is newer -> g |
242 d: remote is newer -> g |
251 getting d |
243 getting d |