[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Monotone-devel] Explicit_merge fails with invariant 'I(cs_left == c
|
From: |
Timothy Brownawell |
|
Subject: |
Re: [Monotone-devel] Explicit_merge fails with invariant 'I(cs_left == cs_right)' on monotone itself |
|
Date: |
Thu, 25 Aug 2005 10:42:36 -0500 |
On Wed, 2005-08-24 at 09:38 +0200, Christof Petig wrote:
> Any idea on how to merge the changes in mainline (propagated to
> nvm.cvssync.win32) into net.venge.monotone.cvssync?
>
> When doing an explicit merge:
>
> mt explicit_merge 7b88f7c9b843cae0b068b5232edf812c9b2b367d
> 0772ad08e5a0c6593219fb22e077929e36afc044
> 76a3c8d6e258681afd550ca3fed3cf776fe7a795 net.venge.monotone.cvssync
>
> and resolving the first two conflicting files by hand (select third
> wherever necessary) I get this error.
...It looks like several files in contrib/ and tests/ are deleted+added
on one side, but not the other.
Tim
diff_a_b
Description: Text document
Re: [Monotone-devel] Explicit_merge fails with invariant 'I(cs_left == cs_right)' on monotone itself,
Timothy Brownawell <=