vendor_1_1_not_root(): new test function

Add a new, failing test case. It can happen that the branch point of
an active vendor branch is actually not a root commit. In this case,
our attempt to delete it fails.

git-svn-id: http://cvs2svn.tigris.org/svn/cvs2svn/trunk@5466 be7e6eca-30d4-0310-a8e5-ac0d63af7087

diff --git a/run-tests.py b/run-tests.py
index 16afd82..22f9fc6 100755 (executable)
--- a/run-tests.py
+++ b/run-tests.py
@@ -4061,6 +4061,16 @@ def newphrases():
       )
 
 
+@XFail_deco()
+@Cvs2SvnTestFunction
+def vendor_1_1_not_root():
+  "supposed vendor 1.1 commit is not a root commit"
+
+  ensure_conversion(
+      'vendor-1-1-non-root',
+      )
+
+
 ########################################################################
 # Run the tests
 
@@ -4279,6 +4289,7 @@ test_list = [
     log_message_eols,
     missing_vendor_branch,
     newphrases,
+    vendor_1_1_not_root,
     ]
 
 if __name__ == '__main__':

diff --git a/test-data/vendor-1-1-non-root-cvsrepos/file001,v b/test-data/vendor-1-1-non-root-cvsrepos/file001,v
new file mode 100644 (file)
index 0000000..2da0903
--- /dev/null
+++ b/test-data/vendor-1-1-non-root-cvsrepos/file001,v
@@ -0,0 +1,53 @@
+head   5.1;
+branch 5.1.0;
+access;
+symbols;
+locks; strict;
+comment        @# @;
+
+
+5.1
+date   2014.01.08.18.04.10;    author author1; state Exp;
+branches
+       5.1.0.1;
+next   1.1;
+
+1.1
+date   2002.08.23.16.30.15;    author author2; state Exp;
+branches;
+next   ;
+
+5.1.0.1
+date   2014.01.08.18.04.10;    author author1; state Exp;
+branches;
+next   ;
+
+
+desc
+@@
+
+
+5.1
+log
+@log 1@
+text
+@This text was last seen in HEAD (revision 5.1)
+@
+
+
+5.1.0.1
+log
+@log 2@
+text
+@@
+
+
+1.1
+log
+@Initial revision
+@
+text
+@d1 1
+a1 1
+This text was last seen in revision 1.1
+@