--- a/tests/test-graft.t Fri Mar 05 14:26:56 2021 -0800
+++ b/tests/test-graft.t Thu Mar 04 08:20:19 2021 -0800
@@ -223,10 +223,6 @@
committing changelog
updating the branch cache
grafting 5:97f8bfe72746 "5"
- all copies found (* = to merge, ! = divergent, % = renamed and deleted):
- on local side:
- src: 'c' -> dst: 'b'
- checking for directory renames
resolving manifests
branchmerge: True, force: True, partial: False
ancestor: 4c60f11aa304, local: 6b9e5368ca4e+, remote: 97f8bfe72746
@@ -240,10 +236,6 @@
$ HGEDITOR=cat hg graft 4 3 --log --debug
scanning for duplicate grafts
grafting 4:9c233e8e184d "4"
- all copies found (* = to merge, ! = divergent, % = renamed and deleted):
- on local side:
- src: 'c' -> dst: 'b'
- checking for directory renames
resolving manifests
branchmerge: True, force: True, partial: False
ancestor: 4c60f11aa304, local: 1905859650ec+, remote: 9c233e8e184d