[Top][All Lists]

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

Re: import inconsistency

From: Derek Robert Price
Subject: Re: import inconsistency
Date: Wed, 11 Jun 2003 09:56:12 -0400
User-agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.0.2) Gecko/20030208 Netscape/7.02

Paul Edwards wrote:

"Derek Robert Price" <derek@ximbiot.com> wrote in message 
This change still isn't appropriate.  Imported files still _shouldn't_
be moved out of the Attic when any revision exists on the trunk.  That
should be reported as a conflict and resolved during a merge step.  A
merge should put the correct version on the trunk and move the file out
of the Attic on commit.

Ok.  I wasn't sure about that.  That's why I asked.  I just assumed
that if other imports go direct to a non-Attic, why shouldn't this
import do the same.

That, or we need to resolve those other issues we've been discussing,
mainly, what it really means when an import occurs with revisions on the
trunk, when such issues should be resolved by assuming that the import
should set the head revision, and how exactly that should happen.

Ok, well that's a more comprehensive change than I was trying
to do at this stage.

The smallest usable change might be to import & fix Steve Cameron's .parent/.base/.trunk patch. Then .base could be used to perform a merge to the trunk after the import, assuming all revisions on the trunk were "dead". That at least should satisfy your scenario, Paul. The case where revisions with content exist on the trunk would be slightly harder. A diff against the empty set would be necesary. This might be scriptable outside of CVS but as long as we are discussing importing Steve's patch, why not add a .null revision?

Of course, the workaround, assuming all your trunk revisions are really dead, might be to tag all the "dead" revisions on your trunk with `cvs tag -r1.1 null-dead' or the like, then perform the merge from null-dead to the vendor branch to the trunk (`cvs up -A -jnull-dead -jVENDOR').



Email: derek@ximbiot.com

Get CVS support at <http://ximbiot.com>!
I am not deliciously saucy.
I am not deliciously saucy.
I am not deliciously saucy...

         - Bart Simpson on chalkboard, _The Simpsons_

reply via email to

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