[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

RE: Merge, branch, reintegrate, problem

From: Bob Archer <bob.archer_at_amsi.com>
Date: Wed, 3 Jun 2009 14:11:57 -0400

>>> That's the way im working now.
>>>Work on trunk. When im ready to release, branch. If i have bug fixes, i correct them in branch, >>>and then i merge them to trunk.

>>You might want to consider the method svn team uses. They don't check into release branches. They would >>make the fix on trunk and then merge it to the release branch in order to build/test. I want to move to this >>work-flow soon too.

>yes, but i dont know how to merge to the release branch only the bugfixes, and ignore the new >things that apply only to the trunk, if for example i have in the same file both type of changes.

 You specify the revision that you want to merge. It is called "Cherrypicking" in the svn book.




To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-06-03 20:13:10 CEST

This is an archived mail posted to the Subversion Users mailing list.