Mercurial > hg

comparison tests/test-graft.t @ 42168:341bddf88ac5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
copies: delete debug message about changes since common ancestor Same reasoning as previous patch. Differential Revision: https://phab.mercurial-scm.org/D6250
author Martin von Zweigbergk <martinvonz@google.com>
date Fri, 12 Apr 2019 21:41:51 -0700
parents 91a0bc50b288
children a68036b849b0
comparison
equal deleted inserted replaced
42167:91a0bc50b288 42168:341bddf88ac5
218 b 218 b
219 committing manifest 219 committing manifest
220 committing changelog 220 committing changelog
221 updating the branch cache 221 updating the branch cache
222 grafting 5:97f8bfe72746 "5" 222 grafting 5:97f8bfe72746 "5"
223 unmatched files in other (from topological common ancestor):
224 c
225 resolving manifests 223 resolving manifests
226 branchmerge: True, force: True, partial: False 224 branchmerge: True, force: True, partial: False
227 ancestor: 4c60f11aa304, local: 6b9e5368ca4e+, remote: 97f8bfe72746 225 ancestor: 4c60f11aa304, local: 6b9e5368ca4e+, remote: 97f8bfe72746
228 e: remote is newer -> g 226 e: remote is newer -> g
229 getting e 227 getting e
233 committing changelog 231 committing changelog
234 updating the branch cache 232 updating the branch cache
235 $ HGEDITOR=cat hg graft 4 3 --log --debug 233 $ HGEDITOR=cat hg graft 4 3 --log --debug
236 scanning for duplicate grafts 234 scanning for duplicate grafts
237 grafting 4:9c233e8e184d "4" 235 grafting 4:9c233e8e184d "4"
238 unmatched files in other (from topological common ancestor):
239 c
240 resolving manifests 236 resolving manifests
241 branchmerge: True, force: True, partial: False 237 branchmerge: True, force: True, partial: False
242 ancestor: 4c60f11aa304, local: 1905859650ec+, remote: 9c233e8e184d 238 ancestor: 4c60f11aa304, local: 1905859650ec+, remote: 9c233e8e184d
243 preserving e for resolve of e 239 preserving e for resolve of e
244 d: remote is newer -> g 240 d: remote is newer -> g
739 735
740 ... grafts of grafts unfortunately can't 736 ... grafts of grafts unfortunately can't
741 $ hg graft -q 13 --debug 737 $ hg graft -q 13 --debug
742 scanning for duplicate grafts 738 scanning for duplicate grafts
743 grafting 13:7a4785234d87 "2" 739 grafting 13:7a4785234d87 "2"
744 unmatched files in other (from topological common ancestor):
745 g
746 unmatched files new in both: 740 unmatched files new in both:
747 b 741 b
748 all copies found (* = to merge, ! = divergent, % = renamed and deleted): 742 all copies found (* = to merge, ! = divergent, % = renamed and deleted):
749 src: 'a' -> dst: 'b' * 743 src: 'a' -> dst: 'b' *
750 checking for directory renames 744 checking for directory renames