[Top][All Lists]

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

Partial merge; aka magic tag for the trunk?

From: J. Cone
Subject: Partial merge; aka magic tag for the trunk?
Date: Wed, 21 Feb 2001 20:08:50 +0000

Hello All,

Appologies in advance if this is a silly question.

I have a file with a branch tag.  I have worked out that I can make another
tag that refers to the same branch (ie continues to refer to the file at
the end of it) by
  cvs admin -nBranchCopy:<magic tag>

This would let me back up a branch tag before I modify it.

Now I am hoping to make the original tag that refer to the trunk (ie
continue to refer to the latest non-branch revision).  Please tell me what
magic tag I should use.

So far I have tried:
  0.1  admin refuses
  1    admin dumps core, leaving locks which I have learned to tidy up

I am using CVS 1.10.5 on HPUX 10.20, via NFS.

[ The final goal is to merge some directories in a module back to the head,
and still have a tag for naming a consistent set of files including the
branched unmerged ones and the trunk merged ones.  I don't care whether
added files in the same directory as the merged ones are added on the trunk
or the branch; caring about that would make my head hurt too much :-) ]

Thank you,
James Cone.

reply via email to

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