[cvsnt] Mergepoints

[Phil Richards]

Bo Berglund wrote:
>>> So by updating to HEAD one gets the latest files on *TRUNK*.

Andy Harrison wrote:
>> Would you use update -jTRUNK or update -jHEAD for this?

Bo Berglund wrote:
> TRUNK is just lingo, it is no real CVS item.
> But HEAD is, it is the automatic tag for the tip of the mainline (Trunk).

Strictly speaking, HEAD is the automatic tag for the tip of the default
branch.  The default branch is *normally* the trunk (the branch named "1").
If you want to *explicitly* refer to the "trunk", use "-r1" or "-j1", or
whatever the appropriate command expects.[*]

Unless you have been playing around with changing the default branch,
you are perfectly safe using "HEAD" instead... and that is what I do
(even though "1" is shorter to type, it is distinctly less friendly).

phil

[*] You might argue that the trunk *is* the default branch, but that isn't
how the CVS docs refer to it - the trunk is explicitly the branch called "1".
-- 
change name before "@" to "phil" for email