[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Monotone-devel] fatal: std::logic_error: roster_merge.cc:528: invar
From: |
Zbynek Winkler |
Subject: |
Re: [Monotone-devel] fatal: std::logic_error: roster_merge.cc:528: invariant 'I(left_name == right_name)' violated |
Date: |
Fri, 28 Mar 2008 10:52:23 +0100 |
On 28/03/2008, Markus Schiltknecht <address@hidden> wrote:
> > 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?
I must have misunderstood the final example that said:
> conflict: duplicate name 'x' for the directory
>
> named 'bar' on the left and
> named 'foo' on the right.
That suggests (at least to me) there is a conflict in the name of the
directory and not in a name within the directory. But it could be that
I am not a native English speaker.
Zbynek
--
http://robotika.cz/
- [Monotone-devel] fatal: std::logic_error: roster_merge.cc:528: invariant 'I(left_name == right_name)' violated, Marcin W. Dąbrowski, 2008/03/27
- Re: [Monotone-devel] fatal: std::logic_error: roster_merge.cc:528: invariant 'I(left_name == right_name)' violated, Markus Schiltknecht, 2008/03/27
- Re: [Monotone-devel] fatal: std::logic_error: roster_merge.cc:528: invariant 'I(left_name == right_name)' violated, Brian May, 2008/03/27
- Re: [Monotone-devel] fatal: std::logic_error: roster_merge.cc:528: invariant 'I(left_name == right_name)' violated, Markus Schiltknecht, 2008/03/27
- Re: [Monotone-devel] fatal: std::logic_error: roster_merge.cc:528: invariant 'I(left_name == right_name)' violated, Zbynek Winkler, 2008/03/28
- Re: [Monotone-devel] fatal: std::logic_error: roster_merge.cc:528: invariant 'I(left_name == right_name)' violated, Markus Schiltknecht, 2008/03/28
- Re: [Monotone-devel] fatal: std::logic_error: roster_merge.cc:528: invariant 'I(left_name == right_name)' violated,
Zbynek Winkler <=
- Re: [Monotone-devel] fatal: std::logic_error: roster_merge.cc:528: invariant 'I(left_name == right_name)' violated, Markus Schiltknecht, 2008/03/28
- Re: [Monotone-devel] fatal: std::logic_error: roster_merge.cc:528: invariant 'I(left_name == right_name)' violated, Thomas Keller, 2008/03/28
- Re: [Monotone-devel] fatal: std::logic_error: roster_merge.cc:528: invariant 'I(left_name == right_name)' violated, Markus Schiltknecht, 2008/03/28
- Re: [Monotone-devel] fatal: std::logic_error: roster_merge.cc:528: invariant 'I(left_name == right_name)' violated, Stephen Leake, 2008/03/28
- Re: [Monotone-devel] fatal: std::logic_error: roster_merge.cc:528: invariant 'I(left_name == right_name)' violated, Derek Scherger, 2008/03/28
- Re: [Monotone-devel] fatal: std::logic_error: roster_merge.cc:528: invariant 'I(left_name == right_name)' violated, Markus Schiltknecht, 2008/03/29
Re: [Monotone-devel] fatal: std::logic_error: roster_merge.cc:528: invariant 'I(left_name == right_name)' violated, Marcin W. Dąbrowski, 2008/03/27