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

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
line wrap: on
line diff
--- a/tests/test-graft.t	Thu Apr 11 23:28:38 2019 -0700
+++ b/tests/test-graft.t	Fri Apr 12 21:41:51 2019 -0700
@@ -220,8 +220,6 @@
   committing changelog
   updating the branch cache
   grafting 5:97f8bfe72746 "5"
-    unmatched files in other (from topological common ancestor):
-     c
   resolving manifests
    branchmerge: True, force: True, partial: False
    ancestor: 4c60f11aa304, local: 6b9e5368ca4e+, remote: 97f8bfe72746
@@ -235,8 +233,6 @@
   $ HGEDITOR=cat hg graft 4 3 --log --debug
   scanning for duplicate grafts
   grafting 4:9c233e8e184d "4"
-    unmatched files in other (from topological common ancestor):
-     c
   resolving manifests
    branchmerge: True, force: True, partial: False
    ancestor: 4c60f11aa304, local: 1905859650ec+, remote: 9c233e8e184d
@@ -741,8 +737,6 @@
   $ hg graft -q 13 --debug
   scanning for duplicate grafts
   grafting 13:7a4785234d87 "2"
-    unmatched files in other (from topological common ancestor):
-     g
     unmatched files new in both:
      b
     all copies found (* = to merge, ! = divergent, % = renamed and deleted):