[Monotone-commits-diffs] Revision 86949ecc0a9e15e4f4531984d55c123946fd4e30

[monotone]

-----------------------------------------------------------------
Revision: 86949ecc0a9e15e4f4531984d55c123946fd4e30
Ancestor: ede827442470c241d7683f408b4323a44deace6e
Author: address@hidden
Date: 2007-11-09T21:22:05
Branch: net.venge.monotone.cvsimport-branch-reconstruction

Added files:
        tests/importing_cvs_with_multiple_vendor_imports2/__driver__.lua
        
tests/importing_cvs_with_multiple_vendor_imports2/cvs-repository/test/fileA,v
        
tests/importing_cvs_with_multiple_vendor_imports2/cvs-repository/test/fileB,v
        
tests/importing_cvs_with_multiple_vendor_imports2/cvs-repository/test/fileC,v
        tests/importing_cvs_with_multiple_vendor_imports2/makerepo.sh
Added directories:
        tests/importing_cvs_with_multiple_vendor_imports2
        tests/importing_cvs_with_multiple_vendor_imports2/cvs-repository
        tests/importing_cvs_with_multiple_vendor_imports2/cvs-repository/test
Modified files:
        rcs_import.cc
Modified attrs:
        tests/importing_cvs_with_multiple_vendor_imports2/makerepo.sh

ChangeLog: 

* Made the previous exception even more restrictive.
* Added another exception, covering symbols on vendor branches.
* Added yet another test with multiple vendor branches, this time with
  stuff propagated back from the vendor branches to trunk. Once with
  a clean merge, once with a manually resolved conflict. (Yeah, believe
  it or not, but CVS does some sort of (vendor) branch propagation, see
  makerepo.sh of the added test case).

txtwa7DeH7Zt6.txt
Description: Diff [ede827442470c241d7683f408b4323a44deace6e] -> [86949ecc0a9e15e4f4531984d55c123946fd4e30]