On Mon, Oct 31, 2011 at 10:18 AM, Gavin "Beau" Baumanis < gavin.bauma...@palcare.com.au> wrote:
> Hi Everyone, > > I hoping that I can get some help with the theory of cherry-picking merges > to a branch. > > I have the "default" subversion layout; > /trunk > /branches > /tags > > I have a "release branch"; ^/branches/releases/1.5 > > I have "^/trunk/filename.txt" > I have just created a release branch, made some changes and created a tag > for release. > ^/tags/1.5 > > The repo revision is @100. > > A colleague makes a some changes, so no filename.txt is @r101. > I make a critical bug fix (unrelated to r101) and now > "^/trunk/filename.txt" is at r102. > > I want to a make a "point" release, so as to get the bug-fix out to > customers. > But the changes made at r101 are not ready for release, yet. > > How do I go about getting "just" the changes made in > "^/trunk.fiename.txt@102", merged into the release branch? > svn merge -c 102 ^/trunk .? Cheers, Daniel B.
