[PATCH 2 of 2] convert: fix test-convert-clonebranches according to tagsbranch topology fix

Edouard Gomez ed.gomez at free.fr
Sat Aug 15 15:06:09 CDT 2009


# HG changeset patch
# User Edouard Gomez <ed.gomez at free.fr>
# Date 1250366593 -7200
# Node ID c1a1b9724ac288c5b53604ddc19c0996bbdffdd7
# Parent  67e0abddf6605e2c16771324b5f3202b7dc30ac3
convert: fix test-convert-clonebranches according to tagsbranch topology fix

Fixes the test-convert-clonebranches output according to my
fix on tagbranch.

However, I must admit that I don't get the meaning of the test
dot.hgrc file. It tries to tag on a '0' branch or try to disable
the feature and thus commit on 'default'.

On the fist case, my patch is correct. On the later, we might
want to put hg.tagsbranch=default or simply remove the line and
rely on default value in the test shell.

diff --git a/tests/test-convert-clonebranches.out b/tests/test-convert-clonebranches.out
--- a/tests/test-convert-clonebranches.out
+++ b/tests/test-convert-clonebranches.out
@@ -18,12 +18,12 @@
 % incremental conversion
 2 c1
 pulling from branch0 into branch1
-2 changesets found
+4 changesets found
 1 c2
 pulling from branch0 into branch2
-2 changesets found
+4 changesets found
 0 c3
 pulling from branch2 into branch3
-3 changesets found
+5 changesets found
 pulling from branch1 into branch3
 1 changesets found


More information about the Mercurial-devel mailing list