t / t9602 / cvsroot / module / sub1 / subsubB / default,von commit Merge branch 'maint' (efd1796)
   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:1.1.1.1.0.2
   8        T_ALL_INITIAL_FILES:1.1.1.1
   9        vendortag:1.1.1.1
  10        vendorbranch:1.1.1;
  11locks; strict;
  12comment @# @;
  13
  14
  151.3
  16date    2003.06.03.04.29.14;    author jrandom; state Exp;
  17branches
  18        1.3.2.1;
  19next    1.2;
  20
  211.2
  22date    2003.05.23.00.17.53;    author jrandom; state Exp;
  23branches;
  24next    1.1;
  25
  261.1
  27date    2003.05.22.23.20.19;    author jrandom; state Exp;
  28branches
  29        1.1.1.1;
  30next    ;
  31
  321.1.1.1
  33date    2003.05.22.23.20.19;    author jrandom; state Exp;
  34branches;
  35next    ;
  36
  371.3.2.1
  38date    2003.06.03.04.33.13;    author jrandom; state Exp;
  39branches;
  40next    ;
  41
  42
  43desc
  44@@
  45
  46
  471.3
  48log
  49@A trunk change to sub1/subsubB/default.  This was committed about an
  50hour after an earlier change that affected most files on branch
  51B_SPLIT.  This file is not on that branch yet, but after this commit,
  52we'll branch to B_SPLIT, albeit rooted in a revision that didn't exist
  53at the time the rest of B_SPLIT was created.
  54@
  55text
  56@This is sub1/subsubB/default.
  57
  58Every directory in the `proj' project has a file named `default'.
  59
  60This line was added in the second commit (affecting all 7 files).
  61
  62This bit was committed on trunk about an hour after an earlier change
  63to everyone else on branch B_SPLIT.  Afterwards, we'll finally branch
  64this file to B_SPLIT, but rooted in a revision that didn't exist at
  65the time the rest of B_SPLIT was created.
  66@
  67
  68
  691.3.2.1
  70log
  71@This change affects sub3/default and sub1/subsubB/default, on branch
  72B_SPLIT.  Note that the latter file did not even exist on this branch
  73until after some other files had had revisions committed on B_SPLIT.
  74@
  75text
  76@a10 4
  77
  78This change affects sub3/default and sub1/subsubB/default, on branch
  79B_SPLIT.  Note that the latter file did not even exist on this branch
  80until after some other files had had revisions committed on B_SPLIT.
  81@
  82
  83
  841.2
  85log
  86@Second commit to proj, affecting all 7 files.
  87@
  88text
  89@d6 5
  90@
  91
  92
  931.1
  94log
  95@Initial revision
  96@
  97text
  98@d4 2
  99@
 100
 101
 1021.1.1.1
 103log
 104@Initial import.
 105@
 106text
 107@@