Re: Merge Question

Geert Theys-2 wrote:
>
> I have a specific merge question I can't seem a answer for.
> I start with Rev1 as start.
>
> Rev2 is a bugfix
> Rev3 is a change request
> Rev4 is another bugfix
>

What about...

svn cp urlToTrunk@Rev4 MyReleaseBranch -m "Created release branch for
customer X"
svn co MyReleaseBranch releaseWC
svn merge -rRev3:Rev2 urlToTrunk releaseWC
// Test, test, test...
svn commit releaseWC -m "Removed feature 'Rev3' from release branch"

Or...

svn cp urlToTrunk@Rev2 MyReleaseBranch -m "Created release branch for
customer X"
svn co MyReleaseBranch releaseWC
svn merge -rRev3:Rev4 urlToTrunk releaseWC
// Test, test, test...
svn commit releaseWC -m "Merged changeset Rev3->Rev4 into release branch"

_
Jorge

--
View this message in context: http://www.nabble.com/Merge-Question-t1404714.html#a3781898
Sent from the Subversion Users forum at Nabble.com.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org