RE: Merge question

Probably a branch rather than a tag. Generally by convention you don't want to commit to tags.

BOb

From: CoolBreeze [mailto:coolbreeze812_at_googlemail.com]
Sent: Friday, March 05, 2010 1:36 PM
To: users_at_subversion.apache.org
Subject: Re: Merge question

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!
On Fri, Mar 5, 2010 at 1:08 PM, Bob Archer <Bob.Archer_at_amsi.com<mailto:Bob.Archer_at_amsi.com>> wrote:
> Ok after having a few more discussions here's a situation that we face
> frequently.
>
> Lets say Bob is working on Trunk\ProjectX\File1 and John is working on
> Trunk\ProjectX\File3 and Trunk\ProjectX\File7. Now Bob needs to leave
> early for the day, but his code is not complete, regardless he comits his
> code, so that it's safe within the repository and gets revision 21. Now
> John at the end of the day comits his code and gets revision 22.
>
> How can a partial merge be done using TortoiseSVN to get John's code, but
> exclude Bob's due to it not being complete yet? Performing an update would
> get you revision 22, which in turn would include Bob's code from revision
> 21.
Um, a merge brings changes from one path to another. You may not fully understand what merge means.

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.

BOb
Received on 2010-03-05 19:47:03 CET