[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

RE: Merge question

From: Bob Archer <Bob.Archer_at_amsi.com>
Date: Fri, 5 Mar 2010 13:08:43 -0500

> 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:08:22 CET

This is an archived mail posted to the Subversion Users mailing list.