Re: Merging only some changes from branch to main trunk

[Pierre Asselin]

In <address@hidden> "Rene Gunther" <address@hidden> writes:

>suppose i have the main trunk M and the branch B. They divided long ago and
>are developed for different reasons. But then I enhance B with a feature I
>want to have in M, too, but only this feature and no other feature of B.
>Could it work out, to tag B, e.g. before-enhance, then enhance B, tag the
>new version after-enhance and use this cvs command:
>cvs update -j before-enhance -j after-enhance

Sure.  Keep good notes in case you have to do this again:  CVS won't
remember what parts of B have been merged and what parts haven't and
you may get spurious conflicts if you try to merge a change twice.