1head 1.3; 2access; 3symbols 4 B_SPLIT:1.3.0.2 5 B_MIXED:1.2.0.2 6 T_MIXED:1.2 7 B_FROM_INITIALS_BUT_ONE:1.1.1.1.0.4 8 B_FROM_INITIALS:1.1.1.1.0.2 9 T_ALL_INITIAL_FILES_BUT_ONE:1.1.1.1 10 T_ALL_INITIAL_FILES:1.1.1.1 11 vendortag:1.1.1.1 12 vendorbranch:1.1.1; 13locks; strict; 14comment @# @; 15 16 171.3 18date 2003.05.23.00.48.51; author jrandom; state Exp; 19branches 20 1.3.2.1; 21next 1.2; 22 231.2 24date 2003.05.23.00.17.53; author jrandom; state Exp; 25branches; 26next 1.1; 27 281.1 29date 2003.05.22.23.20.19; author jrandom; state Exp; 30branches 31 1.1.1.1; 32next ; 33 341.1.1.1 35date 2003.05.22.23.20.19; author jrandom; state Exp; 36branches; 37next ; 38 391.3.2.1 40date 2003.06.03.03.20.31; author jrandom; state Exp; 41branches; 42next ; 43 44 45desc 46@@ 47 48 491.3 50log 51@A single commit affecting one file on branch B_MIXED and one on trunk. 52@ 53text 54@This is sub2/default. 55 56Every directory in the `proj' project has a file named `default'. 57 58This line was added in the second commit (affecting all 7 files). 59 60The same commit added these two lines here on trunk, and two similar 61lines to ./branch_B_MIXED_only on branch B_MIXED. 62@ 63 64 651.3.2.1 66log 67@First change on branch B_SPLIT. 68 69This change excludes sub3/default, because it was not part of this 70commit, and sub1/subsubB/default, which is not even on the branch yet. 71@ 72text 73@a8 2 74 75First change on branch B_SPLIT. 76@ 77 78 791.2 80log 81@Second commit to proj, affecting all 7 files. 82@ 83text 84@d6 3 85@ 86 87 881.1 89log 90@Initial revision 91@ 92text 93@d4 2 94@ 95 96 971.1.1.1 98log 99@Initial import. 100@ 101text 102@@