equal
deleted
inserted
replaced
202 skipping revision 2:5c095ad7e90f (already grafted to 7:ef0ef43d49e7) |
202 skipping revision 2:5c095ad7e90f (already grafted to 7:ef0ef43d49e7) |
203 grafting 1:5d205f8b35b6 "1" |
203 grafting 1:5d205f8b35b6 "1" |
204 unmatched files in local: |
204 unmatched files in local: |
205 b |
205 b |
206 all copies found (* = to merge, ! = divergent, % = renamed and deleted): |
206 all copies found (* = to merge, ! = divergent, % = renamed and deleted): |
207 src: 'a' -> dst: 'b' * |
207 on local side: |
|
208 src: 'a' -> dst: 'b' * |
208 checking for directory renames |
209 checking for directory renames |
209 resolving manifests |
210 resolving manifests |
210 branchmerge: True, force: True, partial: False |
211 branchmerge: True, force: True, partial: False |
211 ancestor: 68795b066622, local: ef0ef43d49e7+, remote: 5d205f8b35b6 |
212 ancestor: 68795b066622, local: ef0ef43d49e7+, remote: 5d205f8b35b6 |
212 preserving b for resolve of b |
213 preserving b for resolve of b |
221 committing manifest |
222 committing manifest |
222 committing changelog |
223 committing changelog |
223 updating the branch cache |
224 updating the branch cache |
224 grafting 5:97f8bfe72746 "5" |
225 grafting 5:97f8bfe72746 "5" |
225 all copies found (* = to merge, ! = divergent, % = renamed and deleted): |
226 all copies found (* = to merge, ! = divergent, % = renamed and deleted): |
226 src: 'c' -> dst: 'b' |
227 on local side: |
|
228 src: 'c' -> dst: 'b' |
227 checking for directory renames |
229 checking for directory renames |
228 resolving manifests |
230 resolving manifests |
229 branchmerge: True, force: True, partial: False |
231 branchmerge: True, force: True, partial: False |
230 ancestor: 4c60f11aa304, local: 6b9e5368ca4e+, remote: 97f8bfe72746 |
232 ancestor: 4c60f11aa304, local: 6b9e5368ca4e+, remote: 97f8bfe72746 |
231 e: remote is newer -> g |
233 e: remote is newer -> g |
237 updating the branch cache |
239 updating the branch cache |
238 $ HGEDITOR=cat hg graft 4 3 --log --debug |
240 $ HGEDITOR=cat hg graft 4 3 --log --debug |
239 scanning for duplicate grafts |
241 scanning for duplicate grafts |
240 grafting 4:9c233e8e184d "4" |
242 grafting 4:9c233e8e184d "4" |
241 all copies found (* = to merge, ! = divergent, % = renamed and deleted): |
243 all copies found (* = to merge, ! = divergent, % = renamed and deleted): |
242 src: 'c' -> dst: 'b' |
244 on local side: |
|
245 src: 'c' -> dst: 'b' |
243 checking for directory renames |
246 checking for directory renames |
244 resolving manifests |
247 resolving manifests |
245 branchmerge: True, force: True, partial: False |
248 branchmerge: True, force: True, partial: False |
246 ancestor: 4c60f11aa304, local: 1905859650ec+, remote: 9c233e8e184d |
249 ancestor: 4c60f11aa304, local: 1905859650ec+, remote: 9c233e8e184d |
247 preserving e for resolve of e |
250 preserving e for resolve of e |
744 ... grafts of grafts unfortunately can't |
747 ... grafts of grafts unfortunately can't |
745 $ hg graft -q 13 --debug |
748 $ hg graft -q 13 --debug |
746 scanning for duplicate grafts |
749 scanning for duplicate grafts |
747 grafting 13:7a4785234d87 "2" |
750 grafting 13:7a4785234d87 "2" |
748 all copies found (* = to merge, ! = divergent, % = renamed and deleted): |
751 all copies found (* = to merge, ! = divergent, % = renamed and deleted): |
749 src: 'a' -> dst: 'b' * |
752 on local side: |
|
753 src: 'a' -> dst: 'b' * |
|
754 on remote side: |
|
755 src: 'a' -> dst: 'b' * |
750 checking for directory renames |
756 checking for directory renames |
751 resolving manifests |
757 resolving manifests |
752 branchmerge: True, force: True, partial: False |
758 branchmerge: True, force: True, partial: False |
753 ancestor: b592ea63bb0c, local: 7e61b508e709+, remote: 7a4785234d87 |
759 ancestor: b592ea63bb0c, local: 7e61b508e709+, remote: 7a4785234d87 |
754 starting 4 threads for background file closing (?) |
760 starting 4 threads for background file closing (?) |