diff options
Diffstat (limited to 'third_party/git/t/t9601/cvsroot')
8 files changed, 0 insertions, 327 deletions
diff --git a/third_party/git/t/t9601/cvsroot/.gitattributes b/third_party/git/t/t9601/cvsroot/.gitattributes deleted file mode 100644 index 562b12e16e..0000000000 --- a/third_party/git/t/t9601/cvsroot/.gitattributes +++ /dev/null @@ -1 +0,0 @@ -* -whitespace diff --git a/third_party/git/t/t9601/cvsroot/CVSROOT/.gitignore b/third_party/git/t/t9601/cvsroot/CVSROOT/.gitignore deleted file mode 100644 index 3bb9b34173..0000000000 --- a/third_party/git/t/t9601/cvsroot/CVSROOT/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -history -val-tags diff --git a/third_party/git/t/t9601/cvsroot/module/added-imported.txt,v b/third_party/git/t/t9601/cvsroot/module/added-imported.txt,v deleted file mode 100644 index 5f83072ea4..0000000000 --- a/third_party/git/t/t9601/cvsroot/module/added-imported.txt,v +++ /dev/null @@ -1,44 +0,0 @@ -head 1.1; -access; -symbols - vtag-4:1.1.1.1 - vbranchA:1.1.1; -locks; strict; -comment @# @; - - -1.1 -date 2004.02.09.15.43.15; author kfogel; state Exp; -branches - 1.1.1.1; -next ; - -1.1.1.1 -date 2004.02.09.15.43.16; author kfogel; state Exp; -branches; -next ; - - -desc -@@ - - -1.1 -log -@Add a file to the working copy. -@ -text -@Adding this file, before importing it with different contents. -@ - - -1.1.1.1 -log -@Import (vbranchA, vtag-4). -@ -text -@d1 1 -a1 1 -This is vtag-4 (on vbranchA) of added-then-imported.txt. -@ - diff --git a/third_party/git/t/t9601/cvsroot/module/imported-anonymously.txt,v b/third_party/git/t/t9601/cvsroot/module/imported-anonymously.txt,v deleted file mode 100644 index 55e1b0ca5d..0000000000 --- a/third_party/git/t/t9601/cvsroot/module/imported-anonymously.txt,v +++ /dev/null @@ -1,42 +0,0 @@ -head 1.1; -branch 1.1.1; -access; -symbols - vtag-1:1.1.1.1; -locks; strict; -comment @# @; - - -1.1 -date 2004.02.09.15.43.13; author kfogel; state Exp; -branches - 1.1.1.1; -next ; - -1.1.1.1 -date 2004.02.09.15.43.13; author kfogel; state Exp; -branches; -next ; - - -desc -@@ - - -1.1 -log -@Initial revision -@ -text -@This is vtag-1 (on vbranchA) of imported-anonymously.txt. -@ - - -1.1.1.1 -log -@Import (vbranchA, vtag-1). -@ -text -@@ - - diff --git a/third_party/git/t/t9601/cvsroot/module/imported-modified-imported.txt,v b/third_party/git/t/t9601/cvsroot/module/imported-modified-imported.txt,v deleted file mode 100644 index e5830aeb37..0000000000 --- a/third_party/git/t/t9601/cvsroot/module/imported-modified-imported.txt,v +++ /dev/null @@ -1,76 +0,0 @@ -head 1.2; -access; -symbols - vtag-2:1.1.1.2 - vtag-1:1.1.1.1 - vbranchA:1.1.1; -locks; strict; -comment @# @; - - -1.2 -date 2004.02.09.15.43.14; author kfogel; state Exp; -branches; -next 1.1; - -1.1 -date 2004.02.09.15.43.13; author kfogel; state Exp; -branches - 1.1.1.1; -next ; - -1.1.1.1 -date 2004.02.09.15.43.13; author kfogel; state Exp; -branches; -next 1.1.1.2; - -1.1.1.2 -date 2004.02.09.15.43.13; author kfogel; state Exp; -branches; -next ; - - -desc -@@ - - -1.2 -log -@First regular commit, to imported-modified-imported.txt, on HEAD. -@ -text -@This is a modification of imported-modified-imported.txt on HEAD. -It should supersede the version from the vendor branch. -@ - - -1.1 -log -@Initial revision -@ -text -@d1 2 -a2 1 -This is vtag-1 (on vbranchA) of imported-modified-imported.txt. -@ - - -1.1.1.1 -log -@Import (vbranchA, vtag-1). -@ -text -@@ - - -1.1.1.2 -log -@Import (vbranchA, vtag-2). -@ -text -@d1 1 -a1 1 -This is vtag-2 (on vbranchA) of imported-modified-imported.txt. -@ - - diff --git a/third_party/git/t/t9601/cvsroot/module/imported-modified.txt,v b/third_party/git/t/t9601/cvsroot/module/imported-modified.txt,v deleted file mode 100644 index bbcfe447b9..0000000000 --- a/third_party/git/t/t9601/cvsroot/module/imported-modified.txt,v +++ /dev/null @@ -1,59 +0,0 @@ -head 1.2; -access; -symbols - vtag-1:1.1.1.1 - vbranchA:1.1.1; -locks; strict; -comment @# @; - - -1.2 -date 2004.02.09.15.43.14; author kfogel; state Exp; -branches; -next 1.1; - -1.1 -date 2004.02.09.15.43.13; author kfogel; state Exp; -branches - 1.1.1.1; -next ; - -1.1.1.1 -date 2004.02.09.15.43.13; author kfogel; state Exp; -branches; -next ; - - -desc -@@ - - -1.2 -log -@Commit on HEAD. -@ -text -@This is a modification of imported-modified.txt on HEAD. -It should supersede the version from the vendor branch. -@ - - -1.1 -log -@Initial revision -@ -text -@d1 2 -a2 1 -This is vtag-1 (on vbranchA) of imported-modified.txt. -@ - - -1.1.1.1 -log -@Import (vbranchA, vtag-1). -@ -text -@@ - - diff --git a/third_party/git/t/t9601/cvsroot/module/imported-once.txt,v b/third_party/git/t/t9601/cvsroot/module/imported-once.txt,v deleted file mode 100644 index c5dd82b12d..0000000000 --- a/third_party/git/t/t9601/cvsroot/module/imported-once.txt,v +++ /dev/null @@ -1,43 +0,0 @@ -head 1.1; -branch 1.1.1; -access; -symbols - vtag-1:1.1.1.1 - vbranchA:1.1.1; -locks; strict; -comment @# @; - - -1.1 -date 2004.02.09.15.43.13; author kfogel; state Exp; -branches - 1.1.1.1; -next ; - -1.1.1.1 -date 2004.02.09.15.43.13; author kfogel; state Exp; -branches; -next ; - - -desc -@@ - - -1.1 -log -@Initial revision -@ -text -@This is vtag-1 (on vbranchA) of imported-once.txt. -@ - - -1.1.1.1 -log -@Import (vbranchA, vtag-1). -@ -text -@@ - - diff --git a/third_party/git/t/t9601/cvsroot/module/imported-twice.txt,v b/third_party/git/t/t9601/cvsroot/module/imported-twice.txt,v deleted file mode 100644 index d1f3f1b344..0000000000 --- a/third_party/git/t/t9601/cvsroot/module/imported-twice.txt,v +++ /dev/null @@ -1,60 +0,0 @@ -head 1.1; -branch 1.1.1; -access; -symbols - vtag-2:1.1.1.2 - vtag-1:1.1.1.1 - vbranchA:1.1.1; -locks; strict; -comment @# @; - - -1.1 -date 2004.02.09.15.43.13; author kfogel; state Exp; -branches - 1.1.1.1; -next ; - -1.1.1.1 -date 2004.02.09.15.43.13; author kfogel; state Exp; -branches; -next 1.1.1.2; - -1.1.1.2 -date 2004.02.09.15.43.13; author kfogel; state Exp; -branches; -next ; - - -desc -@@ - - -1.1 -log -@Initial revision -@ -text -@This is vtag-1 (on vbranchA) of imported-twice.txt. -@ - - -1.1.1.1 -log -@Import (vbranchA, vtag-1). -@ -text -@@ - - -1.1.1.2 -log -@Import (vbranchA, vtag-2). -@ -text -@d1 1 -a1 1 -This is vtag-2 (on vbranchA) of imported-twice.txt. -@ - - |