From c5ca6ce8d5333f11cb13577d95df0e808f2bc4ec Mon Sep 17 00:00:00 2001 From: maxb Date: Tue, 30 Sep 2003 21:03:15 +0000 Subject: [PATCH] Add a better testcase for issue 1421. * tools/cvs2svn/test-data/split-branch-cvsrepos/module: Add directory containing two RCS files: branched-from-branch,v and branched-from-trunk,v . * tools/cvs2svn/test-data/split-branch-cvsrepos/README: Update to take account of the above change. git-svn-id: http://cvs2svn.tigris.org/svn/cvs2svn/trunk@696 be7e6eca-30d4-0310-a8e5-ac0d63af7087 --- test-data/split-branch-cvsrepos/README | 67 +++++++++++++--------- .../module/branched-from-branch,v | 54 +++++++++++++++++ .../module/branched-from-trunk,v | 39 +++++++++++++ 3 files changed, 133 insertions(+), 27 deletions(-) rewrite test-data/split-branch-cvsrepos/README (83%) create mode 100644 test-data/split-branch-cvsrepos/module/branched-from-branch,v create mode 100644 test-data/split-branch-cvsrepos/module/branched-from-trunk,v diff --git a/test-data/split-branch-cvsrepos/README b/test-data/split-branch-cvsrepos/README dissimilarity index 83% index e63337ee..51f1169b 100644 --- a/test-data/split-branch-cvsrepos/README +++ b/test-data/split-branch-cvsrepos/README @@ -1,27 +1,40 @@ -This tree is for reproducing - - http://subversion.tigris.org/issues/show_bug.cgi?id=1421 - -The reproduction data was constructed using bits of the xiph.org -repository, supplied by Jack Moffitt . - -The problem has to do with the creation of branch 'volsung_20010721', -parts of which are copied from trunk, and other parts from branch -'xiphophorus': - - src/ao_private.h,v: - volsung_20010721 ==> 1.1.0.2 - - src/audio_out.c,v: - volsung_20010721 ==> 1.15.0.2 - xiphophorus ==> 1.1.1 - - src/COPYING,v - volsung_20010721 ==> 1.1.1.1.0.4 - xiphophorus ==> 1.1.1 - -(These are actually from /ao/src/ in the xiphrepo; note that COPYING,v -is actually /ao/COPYING,v in the original data, I just moved it to -make the reproduction simpler.) - -See the issue for more details. +This tree is for reproducing + + http://subversion.tigris.org/issues/show_bug.cgi?id=1421 + +There are two sets of reproduction data - 'src' and 'module'. + +'src' directory + + The reproduction data was constructed using bits of the xiph.org + repository, supplied by Jack Moffitt . + + The problem has to do with the creation of branch 'volsung_20010721', + parts of which are copied from trunk, and other parts from branch + 'xiphophorus': + + src/ao_private.h,v: + volsung_20010721 ==> 1.1.0.2 + + src/audio_out.c,v: + volsung_20010721 ==> 1.15.0.2 + xiphophorus ==> 1.1.1 + + src/COPYING,v + volsung_20010721 ==> 1.1.1.1.0.4 + xiphophorus ==> 1.1.1 + + (These are actually from /ao/src/ in the xiphrepo; note that COPYING,v + is actually /ao/COPYING,v in the original data, I just moved it to + make the reproduction simpler.) + + This test began to pass after the fix in r6534. However, similar errors still + occurred with other data sets. The issue was reopened. + +'module' directory + + This test is based on issue-1421-small-cvsrepos.tgz from Blair Zajac. + + It continued to fail until the final fix in r7006. + +See the issue for more details. diff --git a/test-data/split-branch-cvsrepos/module/branched-from-branch,v b/test-data/split-branch-cvsrepos/module/branched-from-branch,v new file mode 100644 index 00000000..8608e831 --- /dev/null +++ b/test-data/split-branch-cvsrepos/module/branched-from-branch,v @@ -0,0 +1,54 @@ +head 1.1; +access; +symbols + demo-node-0:1.1.1.1.0.2 + first_working:1.1.1; +locks; strict; +comment @;; @; + + +1.1 +date 98.02.08.01.48.39; author russel; state Exp; +branches + 1.1.1.1; +next ; + +1.1.1.1 +date 98.02.08.01.48.39; author russel; state Exp; +branches + 1.1.1.1.2.1; +next ; + +1.1.1.1.2.1 +date 98.02.25.18.56.53; author adam; state dead; +branches; +next ; + + +desc +@@ + + +1.1 +log +@Initial revision +@ +text +@@ + + +1.1.1.1 +log +@Create a branch +@ +text +@@ + + +1.1.1.1.2.1 +log +@This revision will go wrong +@ +text +@@ + diff --git a/test-data/split-branch-cvsrepos/module/branched-from-trunk,v b/test-data/split-branch-cvsrepos/module/branched-from-trunk,v new file mode 100644 index 00000000..58eef4eb --- /dev/null +++ b/test-data/split-branch-cvsrepos/module/branched-from-trunk,v @@ -0,0 +1,39 @@ +head 1.1; +access; +symbols + demo-node-0:1.1.0.2; +locks; strict; +comment @;; @; + + +1.1 +date 98.02.19.21.28.43; author russel; state Exp; +branches + 1.1.2.1; +next ; + +1.1.2.1 +date 98.02.25.18.56.53; author adam; state Exp; +branches; +next ; + + +desc +@@ + + +1.1 +log +@Initial revision +@ +text +@@ + + +1.1.2.1 +log +@This revision will go wrong +@ +text +@@ + -- 2.11.4.GIT