Mercurial > hg-stable

diff tests/test-convert-bzr-merges.t @ 39251:6c72e1248856

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: add a test to show the added/modified/removed files in a bzr convert
author Matt Harbison <matt_harbison@yahoo.com>
date Fri, 13 Jul 2018 15:03:15 -0400
parents 7a88643bc0ef
children 5e52b6da9c0c
line wrap: on
line diff
--- a/tests/test-convert-bzr-merges.t	Fri Jul 13 12:33:06 2018 -0400
+++ b/tests/test-convert-bzr-merges.t	Fri Jul 13 15:03:15 2018 -0400
@@ -88,6 +88,20 @@
   no changes found
   [1]
 
+  $ glog -R hg2hg
+  o    5@source "(octopus merge fixup)" files+: [], files-: [], files: []
+  |\
+  | o    4@source "Merged branches" files+: [file-branch1 file-branch2], files-: [], files: [file]
+  | |\
+  o---+  3@source-branch2 "Added brach2 file" files+: [file-branch2], files-: [], files: []
+   / /
+  | o  2@source "Added parent file" files+: [file-parent], files-: [], files: []
+  | |
+  o |  1@source-branch1 "Added branch1 file" files+: [file-branch1], files-: [], files: [file]
+  |/
+  o  0@source "Initial add" files+: [file], files-: [], files: []
+  
+
   $ hg -R source-hg log --debug -r tip
   changeset:   5:6bd55e8269392769783345686faf7ff7b3b0215d
   branch:      source