t / t9602 / cvsroot / module / sub2 / Attic / branch_B_MIXED_only,von commit Merge branch 'mk/init-db-parse-options' (4d4097d)
   1head    1.1;
   2access;
   3symbols
   4        B_MIXED:1.1.0.2;
   5locks; strict;
   6comment @# @;
   7
   8
   91.1
  10date    2003.05.23.00.25.26;    author jrandom; state dead;
  11branches
  12        1.1.2.1;
  13next    ;
  14
  151.1.2.1
  16date    2003.05.23.00.25.26;    author jrandom; state Exp;
  17branches;
  18next    1.1.2.2;
  19
  201.1.2.2
  21date    2003.05.23.00.48.51;    author jrandom; state Exp;
  22branches;
  23next    ;
  24
  25
  26desc
  27@@
  28
  29
  301.1
  31log
  32@file branch_B_MIXED_only was initially added on branch B_MIXED.
  33@
  34text
  35@@
  36
  37
  381.1.2.1
  39log
  40@Add a file on branch B_MIXED.
  41@
  42text
  43@a0 1
  44This file was added on branch B_MIXED.  It never existed on trunk.
  45@
  46
  47
  481.1.2.2
  49log
  50@A single commit affecting one file on branch B_MIXED and one on trunk.
  51@
  52text
  53@a1 3
  54
  55The same commit added these two lines here on branch B_MIXED, and two
  56similar lines to ./default on trunk.
  57@
  58
  59