[PATCH 2 of 3 V2] tests: add a test to show the added/modified/removed files in a bzr convert

Matt Harbison mharbison72 at gmail.com
Mon Aug 20 18:02:51 EDT 2018


# HG changeset patch
# User Matt Harbison <matt_harbison at yahoo.com>
# Date 1531508595 14400
#      Fri Jul 13 15:03:15 2018 -0400
# Node ID c422c23107cbd305ac433ce9bd3de3ba1b1ad33a
# Parent  51e66389f5df997022a8ab76a4c2da2d2e83f206
tests: add a test to show the added/modified/removed files in a bzr convert

diff --git a/tests/test-convert-bzr-merges.t b/tests/test-convert-bzr-merges.t
--- a/tests/test-convert-bzr-merges.t
+++ b/tests/test-convert-bzr-merges.t
@@ -88,6 +88,20 @@ BUG: file-branch2 should not be added in
   no changes found
   [1]
 
+  $ glog -R hg2hg
+  o    5 at source "(octopus merge fixup)" files+: [], files-: [], files: []
+  |\
+  | o    4 at source "Merged branches" files+: [file-branch1 file-branch2], files-: [], files: [file]
+  | |\
+  o---+  3 at source-branch2 "Added brach2 file" files+: [file-branch2], files-: [], files: []
+   / /
+  | o  2 at source "Added parent file" files+: [file-parent], files-: [], files: []
+  | |
+  o |  1 at source-branch1 "Added branch1 file" files+: [file-branch1], files-: [], files: [file]
+  |/
+  o  0 at source "Initial add" files+: [file], files-: [], files: []
+  
+
   $ hg -R source-hg log --debug -r tip
   changeset:   5:6bd55e8269392769783345686faf7ff7b3b0215d
   branch:      source


More information about the Mercurial-devel mailing list