[Top][All Lists]

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

Re: branch updates from mainline ?

From: Derek R. Price
Subject: Re: branch updates from mainline ?
Date: Tue, 09 Jan 2001 11:11:10 -0500

Ken Versteeg wrote:

> on the branch, you can do:
> cvs update -j HEAD
> This will do what you want to do.

The first time, but you'll really want start & end tags to get repeated
merges right.  Review the "Branching & Merging" sections of the Cederqvist: .

Merging the same section of code twice will often be handled properly with
a message like, "Changes between X & Y are already contained in Z", but
doing it too much (building up a lot of code to repeatedly remerge) may
eventually strain the merging algorithm, leaving you to resolve the same
conflicts every time you merge.

Some of the best practices papers & web pages people have been talking
about on the list recently might give you some more hints.


Derek Price                      CVS Solutions Architect ( )
mailto:address@hidden     OpenAvenue ( )
Confucius say, "Man who live in glass house dress in basement."

reply via email to

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