1 head 1.2;
2 access;
3 symbols
4 vtag-2:1.1.1.2
5 vtag-1:1.1.1.1
6 vbranchA:1.1.1;
7 locks; strict;
8 comment @# @;
11 1.2
12 date 2004.02.09.15.43.14; author kfogel; state Exp;
13 branches;
14 next 1.1;
16 1.1
17 date 2004.02.09.15.43.13; author kfogel; state Exp;
18 branches
19 1.1.1.1;
20 next ;
22 1.1.1.1
23 date 2004.02.09.15.43.13; author kfogel; state Exp;
24 branches;
25 next 1.1.1.2;
27 1.1.1.2
28 date 2004.02.09.15.43.13; author kfogel; state Exp;
29 branches;
30 next ;
33 desc
34 @@
37 1.2
38 log
39 @First regular commit, to imported-modified-imported.txt, on HEAD.
40 @
41 text
42 @This is a modification of imported-modified-imported.txt on HEAD.
43 It should supersede the version from the vendor branch.
44 @
47 1.1
48 log
49 @Initial revision
50 @
51 text
52 @d1 2
53 a2 1
54 This is vtag-1 (on vbranchA) of imported-modified-imported.txt.
55 @
58 1.1.1.1
59 log
60 @Import (vbranchA, vtag-1).
61 @
62 text
63 @@
66 1.1.1.2
67 log
68 @Import (vbranchA, vtag-2).
69 @
70 text
71 @d1 1
72 a1 1
73 This is vtag-2 (on vbranchA) of imported-modified-imported.txt.
74 @