maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Squashed 'third_party/git/' content from commit cb71568594

Browse source 
git-subtree-dir: third_party/git
git-subtree-split: cb715685942260375e1eb8153b0768a376e4ece7
This commit is contained in:
Vincent Ambo 2020-01-11 23:36:56 +00:00
commit 1b593e1ea4
3629 changed files with 1139935 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

44
t/t9601/cvsroot/module/added-imported.txt,v Normal file
View file

@ -0,0 +1,44 @@
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.
@

42
t/t9601/cvsroot/module/imported-anonymously.txt,v Normal file
View file

@ -0,0 +1,42 @@
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
@@

76
t/t9601/cvsroot/module/imported-modified-imported.txt,v Normal file
View file

@ -0,0 +1,76 @@
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.
@

59
t/t9601/cvsroot/module/imported-modified.txt,v Normal file
View file

@ -0,0 +1,59 @@
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
@@

43
t/t9601/cvsroot/module/imported-once.txt,v Normal file
View file

@ -0,0 +1,43 @@
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
@@

60
t/t9601/cvsroot/module/imported-twice.txt,v Normal file
View file

@ -0,0 +1,60 @@
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.
@