Re: Cherry-picking revision to merge.

2011-10-30 Thread Gavin "Beau" Baumanis
Hi Daniel, I am certain that I had tried that previously and it didn't work. Well the command worked, of course but the results were not what I was expecting. Up until recently we did not have a "staged" release strategy. We did continuous deployment of ALL changes submitted to the repostor

Re: Cherry-picking revision to merge.

2011-10-30 Thread Daniel Becroft
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 "releas

Cherry-picking revision to merge.

2011-10-30 Thread Gavin "Beau" Baumanis
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