Larry Jones schrieb:

> Peter Wolfe writes [about HEAD meaning the head of the current branch
> rather than the HEAD of the trunk for diff]:
> >
> > Hmm ... while that might be the design intent my observations are that even
> > this is broken:
>
> I think you're right.  It looks to me like what's happening is that diff
> only interprets HEAD as the head of the current branch if the file has
> actually been checked in on the branch; if the file has been branched
> but hasn't actually been checked in on the branch, HEAD is interpreted
> as the head of the trunk instead of the branch point.

To solve the problems and misunderstandings around this subject, what do you
think about introducing a new built-in tag (say TRUNK) that does the same for the
main trunk as a branch tag does for the branch (or should do...), namely always
refer to the latest revision on the main trunk (TRUNK) resp. branch (branch tag),
consistently in all suitable cvs commands? (I hope my understanding of branch
tags is correct so far.)
HEAD should then always refer to the latest revision in the branch resp main
trunk the current working copy is based on and therefore it should not be allowed
in cvs commands that directly work on the repository (like rdiff - don't know if
it is already forbidden there).
I think this would be clear and easy to understand (and to remember), consistent
with the branch tags and it would be more flexible than the current solution as
it offers an access to the latest revision on the main trunk from where you
want..

Best regards
Martin

Reply via email to