[Top][All Lists]

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

Re: import inconsistency

From: Paul Edwards
Subject: Re: import inconsistency
Date: Fri, 13 Jun 2003 20:17:56 GMT

"Derek Robert Price" <derek@ximbiot.com> wrote in message 
> >It's not the end of the world though, assuming
> >that conflict on added files gets committed, there will be no
> >KNOWN integrity problems involving source code lost, which is
> >a damn good start!!!  Oh, and the fact that there are now separate
> >release and development branches also makes a hell of a difference
> >too.  At the end of the day, it's pretty good.  :-)
> Want to explain again why an added file should produce a conflict
> _after_ a merge?

First of all, the example test case I gave was just the minimum
required to invoke the problem, the real situation is when working
on a branch.

On a branch I add a file.

On an import the file also gets added.

Now I attempt to join all imports onto the branch.  It says "conflict -
has been added" and doesn't know what to do.  I have two versions
of the same file, and it doesn't know which one is correct.  But it
doesn't actually mark it as a conflict, so if I do a "cvs commit", it
doesn't produce an error.  Now it does.

BFN.  Paul.

reply via email to

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