Mercurial > hg

diff tests/test-graft.t @ 42164:96bd75e67a94

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
copies: fix up "fullcopy" with missing entries from "copy" This is just a workaround similar to the previous one. It will make it easier to follow later patches. Differential Revision: https://phab.mercurial-scm.org/D6246
author Martin von Zweigbergk <martinvonz@google.com>
date Mon, 15 Apr 2019 16:41:43 -0700
parents 7815cf0ea88b
children 91a0bc50b288
line wrap: on
line diff
--- a/tests/test-graft.t	Sun Apr 14 00:46:25 2019 -0700
+++ b/tests/test-graft.t	Mon Apr 15 16:41:43 2019 -0700
@@ -749,6 +749,9 @@
      g
     unmatched files new in both:
      b
+    all copies found (* = to merge, ! = divergent, % = renamed and deleted):
+     src: 'a' -> dst: 'b' *
+    checking for directory renames
   resolving manifests
    branchmerge: True, force: True, partial: False
    ancestor: b592ea63bb0c, local: 7e61b508e709+, remote: 7a4785234d87