RE: Merge question
From: Bob Archer <Bob.Archer_at_amsi.com>
Date: Fri, 5 Mar 2010 13:47:23 -0500
Probably a branch rather than a tag. Generally by convention you don't want to commit to tags.
From: CoolBreeze [mailto:coolbreeze812_at_googlemail.com]
Thanks Bob. I'm trying to get an understanding of how Merge works. I was actually thinking in the case I presented that Bob actually shouldn't be checking his unfinished work into the Trunk until it is finished as you stated and that he should create a Tag to use until it is.
Anyway thanks for the clarification!
however, if you are saying you want to get John's code to say Branches\Stable then you can do a merge and just choose rev 22.
However, you really shouldn't let dev check in stuff that isn't done into trunk. Bob should create a branch for the issue he is working on and check into that. Once all his work is completed it can be merged into trunk using --reintegrate and then the issue branch can be deleted.
This is an archived mail posted to the Subversion Users mailing list.