1 head 1.1;
2 access;
3 symbols
4 B_MIXED:1.1.0.2;
5 locks; strict;
6 comment @# @;
9 1.1
10 date 2003.05.23.00.25.26; author jrandom; state dead;
11 branches
12 1.1.2.1;
13 next ;
15 1.1.2.1
16 date 2003.05.23.00.25.26; author jrandom; state Exp;
17 branches;
18 next 1.1.2.2;
20 1.1.2.2
21 date 2003.05.23.00.48.51; author jrandom; state Exp;
22 branches;
23 next ;
26 desc
27 @@
30 1.1
31 log
32 @file branch_B_MIXED_only was initially added on branch B_MIXED.
33 @
34 text
35 @@
38 1.1.2.1
39 log
40 @Add a file on branch B_MIXED.
41 @
42 text
43 @a0 1
44 This file was added on branch B_MIXED. It never existed on trunk.
45 @
48 1.1.2.2
49 log
50 @A single commit affecting one file on branch B_MIXED and one on trunk.
51 @
52 text
53 @a1 3
55 The same commit added these two lines here on branch B_MIXED, and two
56 similar lines to ./default on trunk.
57 @