Daryle Walker <[EMAIL PROTECTED]> writes: > On Sunday, August 24, 2003, at 4:26 PM, David Abrahams wrote: > >> Janusz Piwowarski <[EMAIL PROTECTED]> writes: >> >>> On Sunday, August 24, 2003, 7:15:11 AM, Daryle Walker wrote: >>> >>>> I have a "CVS Quick Reference Card" lying around, and the entries >>>> for "checkout" and "update" have a sub-option "-j REV" that says >>>> "Merge in changes". That can't fuse one branch into another? (I >>>> wouldn't want to potentially hose our CVS experimenting with this. >>>> Any experts out there that know what this sub-option does?) >>> >>> You're right, -j option with update command can merge changes >>> between branches. It works ok, marks places changed in both >>> branches with standard cvs markers >>>> and <<<<. >> >> That doesn't mean you can use it to correctly and automatically >> merge RC_1_30_0 into the trunk, because many cross-merges have >> already been made and there is no marker on the RC_1_30_0 branch to >> use with the first -j option. >> >> I don't know why anyone would want to try to make this simple change >> to the index page into a project which potentially touches every >> single file in the repository, anyway. > > I was thinking ahead to every file that had a change in 1.30.2 but > wasn't yet in the main trunk. If most of the changes have been > manually transferred already, then there is little point in doing a > merging command. If we still have a lot of manual merging ahead of > us, then automation could help.
Most changes were made in the trunk first and then transferred to 1.30.2. A project-wide automated merge from branch to trunk would be a disaster. -- Dave Abrahams Boost Consulting www.boost-consulting.com _______________________________________________ Unsubscribe & other changes: http://lists.boost.org/mailman/listinfo.cgi/boost
