[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: Wed, 11 Jun 2003 14:21:02 GMT

"Derek Robert Price" <derek@ximbiot.com> wrote in message 
> 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,

Not all my trunks are dead, almost all of them are live, from a previous
import where there was no existing branch.

Plus, I do use the head for local versions of some of the files,
that aren't meant to be shipped "externally".  I could put them
on a branch, but it seemed a bit of a waste for about 2-3 files.

> then perform the merge from null-dead
> to the vendor branch to the trunk (`cvs up -A -jnull-dead -jVENDOR').

... so this won't work as I understand it.

The smallest usable patch that I see is that it could be moved
out of the Attic if the head is 1.1 (ie there is no 1.2) and it is
dead.  That way for the very simplest case, where a tinpot
branch got in first, and no-one else knows about it, it will
move to its proper place.  I don't know how to do that at this
stage though, so its probably better to just live with an
occasional anomaly, or manually move it, since at the end
of the day, that doesn't cause any known problems.

I went back and looked at a directory that I had to move out
of the repository because it was causing me weird errors,
but that is something unrelated to Attic, and in fact, not
likely to cause me problems anymore either, now that it's
gone.  But I think it is an outstanding integrity issue, I will
post details again.

BFN.  Paul.

reply via email to

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