[PATCH 2 of 5 RFC] tests: add a test to show the added/modified/removed files in a bzr convert
Matt Harbison
mharbison72 at gmail.com
Fri Jul 27 14:10:09 EDT 2018
# HG changeset patch
# User Matt Harbison <matt_harbison at yahoo.com>
# Date 1531508595 14400
# Fri Jul 13 15:03:15 2018 -0400
# Branch stable
# Node ID 2d3223b88c2f51bcac46958a2feab656f935a08a
# Parent 3da5d60bf6e7ad121cea897e2f59846007f3cc9f
tests: add a test to show the added/modified/removed files in a bzr convert
Since we're having trouble making the second leg of a bzr -> hg -> hg convert
stable, it seems worth also showing the files in the hg -> hg convert. This
reflects the same problem from the last patch, inherited from the bzr -> hg
conversion.
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,19 @@ BUG: file-branch2 should not be added in
5[tip]:4,3 6bd55e826939 2009-10-10 08:00 +0100 foo
(octopus merge fixup)
+ $ 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: []
+
XXX: The manifest lines should probably agree, to avoid changing the hash when
converting hg -> hg
More information about the Mercurial-devel
mailing list