[Monotone-commits-diffs] Revision 116c0f4c974e0cc39909cb7b06018d9483a3895f

[monotone]

-----------------------------------------------------------------
Revision: 116c0f4c974e0cc39909cb7b06018d9483a3895f
Ancestor: 12f55b19983686f1a4cdecd7d2812b1bfcdbc39b
Author: address@hidden
Date: 2008-01-07T11:04:42
Branch: net.venge.monotone.cvsimport-branch-reconstruction

Modified files:
        rcs_import.cc tests/importing_cvs_branches5/__driver__.lua
        tests/importing_cvs_branches5/cvs-repository/test/file1,v
        tests/importing_cvs_branches5/cvs-repository/test/file2,v
        tests/importing_cvs_branches5/makerepo.sh
        tests/importing_cvs_with_conflicting_tag3/__driver__.lua

ChangeLog: 

* Added merging of parents into artificial revisions, required if
  a blob from CVS has multiple parents, possibly from different
  branches.
* Improved the test case importing_cvs_branches5, to check for correct
  log messages after importing such a conflicting branch.
* Marked both, importing_cvs_branches5 and
  importing_cvs_with_conflicting_tag3 as expected to succeed.

txtuiKLqT6Zol.txt
Description: Diff [12f55b19983686f1a4cdecd7d2812b1bfcdbc39b] -> [116c0f4c974e0cc39909cb7b06018d9483a3895f]