[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: adding on branch
Re: adding on branch
Tue, 27 May 2003 13:40:20 GMT
"Max Bowsher" <address@hidden> wrote in message news:address@hidden
> 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
> >> exists, there is no reason for import to touch head, and no reason to
> >> 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,
But that's the whole point - there is no existing head development.
All there is is a user mucking around on his own branch, which is
what people with their own branch tend to do. A user mucking
around on his branch should not interfere with what is essentially
> simply shows a conflict, and expects you to do a merge.
I don't mind the conflict. But I won't notice it either way. There
entire source tree shows up as a conflict whenever I do an
import, because almost every single file exists, and has half a
dozen branches on it.
I do mind having to do a merge to get the head made active.
I didn't even realise I could do that. I thought I needed to
manually move it out of the Attic to get a head "created"?
I don't want to manually merge all these files anyway, I want
to be able to say "yes, yes, yes, all those imported files, make
them active, regardless of what some tinpot branch owner
has been up to".
> >>> 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.
I think existing behaviour is illogical, and requires manual
processing for no reason.