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

merge(third_party/git): Merge squashed git subtree at v2.23.0

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

59
third_party/git/t/t9602/cvsroot/module/sub2/Attic/branch_B_MIXED_only,v vendored Normal file
View file

@ -0,0 +1,59 @@
head 1.1;
access;
symbols
B_MIXED:1.1.0.2;
locks; strict;
comment @# @;
1.1
date 2003.05.23.00.25.26; author jrandom; state dead;
branches
1.1.2.1;
next ;
1.1.2.1
date 2003.05.23.00.25.26; author jrandom; state Exp;
branches;
next 1.1.2.2;
1.1.2.2
date 2003.05.23.00.48.51; author jrandom; state Exp;
branches;
next ;
desc
@@
1.1
log
@file branch_B_MIXED_only was initially added on branch B_MIXED.
@
text
@@
1.1.2.1
log
@Add a file on branch B_MIXED.
@
text
@a0 1
This file was added on branch B_MIXED. It never existed on trunk.
@
1.1.2.2
log
@A single commit affecting one file on branch B_MIXED and one on trunk.
@
text
@a1 3
The same commit added these two lines here on branch B_MIXED, and two
similar lines to ./default on trunk.
@

102
third_party/git/t/t9602/cvsroot/module/sub2/default,v vendored Normal file
View file

@ -0,0 +1,102 @@
head 1.3;
access;
symbols
B_SPLIT:1.3.0.2
B_MIXED:1.2.0.2
T_MIXED:1.2
B_FROM_INITIALS_BUT_ONE:1.1.1.1.0.4
B_FROM_INITIALS:1.1.1.1.0.2
T_ALL_INITIAL_FILES_BUT_ONE:1.1.1.1
T_ALL_INITIAL_FILES:1.1.1.1
vendortag:1.1.1.1
vendorbranch:1.1.1;
locks; strict;
comment @# @;
1.3
date 2003.05.23.00.48.51; author jrandom; state Exp;
branches
1.3.2.1;
next 1.2;
1.2
date 2003.05.23.00.17.53; author jrandom; state Exp;
branches;
next 1.1;
1.1
date 2003.05.22.23.20.19; author jrandom; state Exp;
branches
1.1.1.1;
next ;
1.1.1.1
date 2003.05.22.23.20.19; author jrandom; state Exp;
branches;
next ;
1.3.2.1
date 2003.06.03.03.20.31; author jrandom; state Exp;
branches;
next ;
desc
@@
1.3
log
@A single commit affecting one file on branch B_MIXED and one on trunk.
@
text
@This is sub2/default.
Every directory in the `proj' project has a file named `default'.
This line was added in the second commit (affecting all 7 files).
The same commit added these two lines here on trunk, and two similar
lines to ./branch_B_MIXED_only on branch B_MIXED.
@
1.3.2.1
log
@First change on branch B_SPLIT.
This change excludes sub3/default, because it was not part of this
commit, and sub1/subsubB/default, which is not even on the branch yet.
@
text
@a8 2
First change on branch B_SPLIT.
@
1.2
log
@Second commit to proj, affecting all 7 files.
@
text
@d6 3
@
1.1
log
@Initial revision
@
text
@d4 2
@
1.1.1.1
log
@Initial import.
@
text
@@

102
third_party/git/t/t9602/cvsroot/module/sub2/subsubA/default,v vendored Normal file
View file

@ -0,0 +1,102 @@
head 1.2;
access;
symbols
B_SPLIT:1.2.0.2
B_MIXED:1.1.0.2
T_MIXED:1.1
B_FROM_INITIALS_BUT_ONE:1.1.1.1.0.4
B_FROM_INITIALS:1.1.1.1.0.2
T_ALL_INITIAL_FILES_BUT_ONE:1.1.1.1
T_ALL_INITIAL_FILES:1.1.1.1
vendortag:1.1.1.1
vendorbranch:1.1.1;
locks; strict;
comment @# @;
1.2
date 2003.05.23.00.17.53; author jrandom; state Exp;
branches
1.2.2.1;
next 1.1;
1.1
date 2003.05.22.23.20.19; author jrandom; state Exp;
branches
1.1.1.1
1.1.2.1;
next ;
1.1.1.1
date 2003.05.22.23.20.19; author jrandom; state Exp;
branches;
next ;
1.1.2.1
date 2003.05.23.00.31.36; author jrandom; state Exp;
branches;
next ;
1.2.2.1
date 2003.06.03.03.20.31; author jrandom; state Exp;
branches;
next ;
desc
@@
1.2
log
@Second commit to proj, affecting all 7 files.
@
text
@This is sub2/subsub2/default.
Every directory in the `proj' project has a file named `default'.
This line was added in the second commit (affecting all 7 files).
@
1.2.2.1
log
@First change on branch B_SPLIT.
This change excludes sub3/default, because it was not part of this
commit, and sub1/subsubB/default, which is not even on the branch yet.
@
text
@a5 2
First change on branch B_SPLIT.
@
1.1
log
@Initial revision
@
text
@d4 2
@
1.1.2.1
log
@Modify three files, on branch B_MIXED.
@
text
@a3 2
This line was added on branch B_MIXED only (affecting 3 files).
@
1.1.1.1
log
@Initial import.
@
text
@@