[Top][All Lists]

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

Merging trunk changes into a branch

From: John Daniel Doucette
Subject: Merging trunk changes into a branch
Date: Wed, 22 Aug 2001 08:43:29 -0300


'HEAD' is the special reserved tag that refers to the tip of the trunk in CVS. To merge trunk changes into a branch, checkout a working copy of the branch, then do an 'update -j HEAD'. It should merge changes from the tip of the trunk into the working copy of the branch. Resolve any conflicts, update -r <branch-name> to remove branch sticky tags, then commit. According to CVS documentation, "Karl Fogel",, 'HEAD' can be used anywheres a revision is required. However, I have found that it doesn't always work if used as a revision parameter to the 'cvs diff' command.

John Daniel Doucette, Sr. Software Designer

J. J. MacKay Canada Limited
Halifax R & D Office
1046 Barrington Street, 1st Floor
Halifax, Nova Scotia
B3H 2R1

Phone           902.423.7727  x222
Fax             902.422.8108
Web             www . jjmackay . ca
Email           john . doucette @ jjmackay . ca

reply via email to

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