[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [Monotone-devel] fatal: std::logic_error: invar

From: Markus Schiltknecht
Subject: Re: [Monotone-devel] fatal: std::logic_error: invariant 'I(left_name == right_name)' violated
Date: Fri, 28 Mar 2008 10:25:28 +0100
User-agent: Mozilla-Thunderbird (X11/20080110)


Zbynek Winkler wrote:
Nice explanation.


I'd like to offer alternate view. It reminds me more
the case when two different revisions independently add a file with
the same name.

Yes, that's exactly the case. They want to add the same file name "x" to the same directory. The fact that one (or both) revisions also renamed that directory doesn't matter, it's still the same directory with the same contents.

I don't see why in this case there should be a conflict
on the name of the directory...

I'm not sure I understand. There's no conflict with regard to the directory name: the directory will be named "bar" in the merged revision, as that rename was the only change against the base_rev, in the above example.

Only the filenames ("x" and "x") of the files added are in conflict.

Am I clear?



reply via email to

[Prev in Thread] Current Thread [Next in Thread]