bug-cvs
[Top][All Lists]
Advanced

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

Re: adding on branch


From: Max Bowsher
Subject: Re: adding on branch
Date: Mon, 26 May 2003 11:43:33 +0100

Paul Edwards wrote:
> "Max Bowsher" <address@hidden> wrote in message
>> Um, no. There cannot not be a head. Therefore, when a file is added on a
>> branch, there *must* be a dead head added. Correspondingly, importing
>> creates a live head revision it creates a new RCS file - but if one
already
>> exists, there is no reason for import to touch head, and no reason to
affect
>> the Attic-status of a file.
>
> Logically, I don't think a user submitting an advanced version of
> a file, on his own branch, should interfere with the natural behaviour
> of an import, which would create a non-dead-head, not in the
> Attic.  The whole point of a branch is for people to have their
> own playpen and not cause harm to the natural processing
> outside that branch.

Except the natural behaviour of an import is to add revisions to the vendor
branch, and create a head revision to start from *if and only if* one does
not exist already. If there is *any* existing head development, import
simply shows a conflict, and expects you to do a merge.

>>> At work, our multiple projects are branched off various drops of
>>> various imports.  The head is never used.  So we never get files
>>> added on a branch moved out of the Attic unless I do it manually.
>>
>> And this is a problem because...?
>
> I have had other problems, can't remember exactly what, and I
> solved them by moving them out the Attic.  I don't think a file
> should be in the Attic if it's counterparts (imported in the same
> way) are not.

The rule is simple: "head is dead" == "in Attic".
The fact that 2 files came from the same import is irrelevant.

Max.





reply via email to

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