[Top][All Lists]

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

Re: branch updates from mainline ?

From: Ken Versteeg
Subject: Re: branch updates from mainline ?
Date: Mon, 08 Jan 2001 10:56:10 -0600

on the branch, you can do:

cvs update -j HEAD

This will do what you want to do.

What I don't know is how this will impact the eventual merge from the
branch back to the head.  Anyone have any experience with this?  As I
understand it, to merge a branch back to the head, one would do the
following on the head:

cvs update -j BRANCH_NAME

which computes all the changes made in the branch, and applies them as a
patch to the HEAD.  Won't a change made in the HEAD and merged to the
branch result in a conflict when it gets merged back to the HEAD? 
(since the same line of code has been changed in the two versions).  Or
is CVS smart enough to know that the changes are identical, and
therefore do not constitute a conflict?


address@hidden wrote:
> hi, i have created a branch off the mainline repository...
> is there any way in which i can do a "cvs update", and it will update
> the branch with the files in the mainline repository ?
> get what im trying to do ?, i dont want to merge the files back in
> yet, but i would like to get the latet code out from the mainline
> repository ?,
> is there anyway that this can be done ?
> thanks
> David
> _______________________________________________
> Info-cvs mailing list
> address@hidden


Ken Versteeg
5520 Research Park Dr.  Madison, WI  53711
(608)298.1246  pager:376.6573  cell:212.2556
Berbee...putting the E in business.

reply via email to

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