Cherry-picking revision to merge.
From: Gavin \ <gavin.baumanis_at_palcare.com.au>
Date: Mon, 31 Oct 2011 11:18:28 +1100
I hoping that I can get some help with the theory of cherry-picking merges to a branch.
I have the "default" subversion layout;
I have a "release branch"; ^/branches/releases/1.5
I have "^/trunk/filename.txt"
The repo revision is @100.
A colleague makes a some changes, so no filename.txt is @r101.
I want to a make a "point" release, so as to get the bug-fix out to customers.
How do I go about getting "just" the changes made in "^/trunk.fiename.txt_at_102", merged into the release branch?
This scenario is deliberately simple,
The problem I seeing is;
I hope that makes sense - please let me know if I can give you any more details.
And as always - Thanks in advance for any thoughts you might have.
This is an archived mail posted to the Subversion Users mailing list.