[Monotone-commits-diffs] Revision 08f49adf63442178e710215d26c416cb2ab5ec3c

[monotone]

-----------------------------------------------------------------
Revision: 08f49adf63442178e710215d26c416cb2ab5ec3c
Ancestor: 38ad3cc0dc773fe7b8192cfa785d7bb96dc288e5
Author: address@hidden
Date: 2007-09-17T21:35:11
Branch: net.venge.monotone.cvsimport-branch-reconstruction

Added files:
        tests/importing_cvs_branches3/__driver__.lua
        tests/importing_cvs_branches3/cvs-repository/test/file1,v
        tests/importing_cvs_branches3/cvs-repository/test/file2,v
        tests/importing_cvs_branches3/makerepo.sh
Added directories:
        tests/importing_cvs_branches3
        tests/importing_cvs_branches3/cvs-repository
        tests/importing_cvs_branches3/cvs-repository/test
Modified attrs:
        tests/importing_cvs_branches3/makerepo.sh

ChangeLog: 

* Added another branches test, which triggers a branch reduction
  error: two conflicts with the same changelog and author in different
  branches. As there are no other conflicts, the two commits on two
  different files end up in the same blob.

txti1mKIQSKm0.txt
Description: Diff [38ad3cc0dc773fe7b8192cfa785d7bb96dc288e5] -> [08f49adf63442178e710215d26c416cb2ab5ec3c]