[Top][All Lists]

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

Re: Updating a branch

From: Matthew Riechers
Subject: Re: Updating a branch
Date: Fri, 01 Jun 2001 06:48:11 -0400

Claire McGarry wrote:
> Assume you have a branch for long term development.
> A bugfix is required, and you fix the bug in the main line code.
> In CVS can you update the branch with the bug fix you just implemented on
> the mainline?
> Thanks
> Claire

The usual method is to make the fix at the revision where the bug first
appeared (on a branch). If the bug still exists in the HEAD (mainline),
a merge will fix the bug in the current revision. I believe you can
reverse the technique to merge the mainline into a branch. See the
following for details:


reply via email to

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