[Monotone-commits-diffs] Revision 6f4c94ad44df760daa80e71954c3cf9f2e6c610a

[monotone]

-----------------------------------------------------------------
Revision: 6f4c94ad44df760daa80e71954c3cf9f2e6c610a
Ancestor: 5760c3950805aa3f420723e4fe1a442756810e0e
Author: address@hidden
Date: 2008-01-14T13:48:01
Branch: net.venge.monotone.cvsimport-branch-reconstruction

Modified files:
        rcs_import.cc

ChangeLog: 

* Dropped one of the invariants again, as it was overly pessimistic and
  made some tests fail.
* Prevent the cross path code from introducing a new e.second which
  is a branch start or tag blob. Those may have multiple ancestors and
  we never want to split them. Instead, fall back to use the newly found
  common ancestor and resolve the original, lower e.second.

txtnomOJ8dqEE.txt
Description: Diff [5760c3950805aa3f420723e4fe1a442756810e0e] -> [6f4c94ad44df760daa80e71954c3cf9f2e6c610a]