test-data/crossed-branches-cvsrepos/proj/file1.txt,v

   1 head    1.2;
   2 access;
   3 symbols
   4         BRANCH4:1.2.0.4
   5         BRANCH3:1.2.0.2
   6         BRANCH2:1.1.0.4
   7         BRANCH1:1.1.0.2;
   8 locks; strict;
   9 comment @# @;
  10
  11
  12 1.2
  13 date    2007.01.20.14.54.27;    author mhagger; state Exp;
  14 branches
  15         1.2.2.1
  16         1.2.4.1;
  17 next    1.1;
  18
  19 1.1
  20 date    2007.01.20.14.45.02;    author mhagger; state Exp;
  21 branches;
  22 next    ;
  23
  24 1.2.2.1
  25 date    2007.01.20.14.56.46;    author mhagger; state Exp;
  26 branches;
  27 next    ;
  28
  29 1.2.4.1
  30 date    2007.01.20.14.57.11;    author mhagger; state Exp;
  31 branches;
  32 next    ;
  33
  34
  35 desc
  36 @@
  37
  38
  39 1.2
  40 log
  41 @Revisions 1.2
  42 @
  43 text
  44 @1.2
  45 @
  46
  47
  48 1.2.4.1
  49 log
  50 @Shared commit message
  51 @
  52 text
  53 @d1 1
  54 a1 1
  55 BRANCH4 commit
  56 @
  57
  58
  59 1.2.2.1
  60 log
  61 @Shared commit message
  62 @
  63 text
  64 @d1 1
  65 a1 1
  66 BRANCH3 commit
  67 @
  68
  69
  70 1.1
  71 log
  72 @Adding two files
  73 @
  74 text
  75 @d1 1
  76 @
  77