7ef0d62730
Merge commit '1b593e1ea4d2af0f6444d9a7788d5d99abd6fde5' as 'third_party/git'
102 lines
1.4 KiB
Text
102 lines
1.4 KiB
Text
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
|
|
@@
|