[Top][All Lists]

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

Merging branches

From: CRISP Norman
Subject: Merging branches
Date: Fri, 13 Oct 2006 08:45:50 -0500

Hello all,

Hoping someone can provide some clarification.  

I wish to perform a merge from a branch to the main truck.  I normally
use tags when performing merges and all works well.  Because a third
branch was merged into my now current source branch I would like to
perform this merge based on a date and not a tag.  The reason for this
is that since the merge from branch 3 to my now current source branch
there has been bug fixes that have occurred and I want to pick up those
changes too.

When updating to perform the merge using a date will CVS merge only
those files committed on that date or from that date forward?  In
simpler words, I would like to merge branch two into main truck and
pickup all changes from a specified date forward.  Not sure if this can
be done though.


reply via email to

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