Re: Merge question
On Thu, Mar 04, 2010 at 02:29:33PM -0500, CoolBreeze wrote: > Now having all production source code witin the Trunk and development within > the Branches, if I'm working on the source of a particular sub-program > within the Branches as well as another developer is working a different > source file also under the same Branch, I've completed my work and am ready > for my changes to be merged back into the Trunk. Is it possible to merge This is a cherry-pick merge. Check out the Merge chapter of the book (or wait for someone less lazy than me to link you to it). tyler
RE: Merge question
> On Thu, Mar 04, 2010 at 02:29:33PM -0500, CoolBreeze wrote: > > Now having all production source code witin the Trunk and development > within > > the Branches, if I'm working on the source of a particular sub-program > > within the Branches as well as another developer is working a different > > source file also under the same Branch, I've completed my work and am > ready > > for my changes to be merged back into the Trunk. Is it possible to merge > > This is a cherry-pick merge. Check out the Merge chapter of the book (or > wait for someone less lazy than me to link you to it). > > tyler http://svnbook.red-bean.com/nightly/en/svn-book.html#svn.branchmerge.cherrypicking BOb
Re: Merge question
On Thu, Mar 04, 2010 at 02:49:53PM -0500, Bob Archer wrote: > http://svnbook.red-bean.com/nightly/en/svn-book.html#svn.branchmerge.cherrypicking Bob is an excellent example of someone less lazy than me :). tyler
Re: Merge question
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. I was looking over the merge options within Tortoise, but I was unable to easily indentify a way of handling this type of situation, if it's even possible to do so. Thanks. On Fri, Mar 5, 2010 at 10:22 AM, Tyler wrote: > I am not the list. > > On Fri, Mar 05, 2010 at 08:45:59AM -0500, CoolBreeze 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. > > > > I was looking over the merge options within Tortoise, but I was unable to > > easily indentify a way of handling this type of situation, if it's even > > possible to do so. > > > > Thanks. > > > > On Thu, Mar 4, 2010 at 4:04 PM, Tyler wrote: > > > > > Try this query again on the list. You'll need to add more detail (what > > > did you try? what is the output?) if you want a good answer. > > > > > > tyler > > > > > > On Thu, Mar 04, 2010 at 02:38:48PM -0500, CoolBreeze wrote: > > > > Thanks I had a look already, but I'm just just not understanding > clearly > > > how > > > > to handle deal with it. I was looking for something more > straightforward > > > on > > > > this particular situatin. > > > > > > > > > > > > On Thu, Mar 4, 2010 at 2:33 PM, Tyler Roscoe > wrote: > > > > > > > > > On Thu, Mar 04, 2010 at 02:29:33PM -0500, CoolBreeze wrote: > > > > > > Now having all production source code witin the Trunk and > development > > > > > within > > > > > > the Branches, if I'm working on the source of a particular > > > sub-program > > > > > > within the Branches as well as another developer is working a > > > different > > > > > > source file also under the same Branch, I've completed my work > and am > > > > > ready > > > > > > for my changes to be merged back into the Trunk. Is it possible > to > > > merge > > > > > > > > > > This is a cherry-pick merge. Check out the Merge chapter of the > book > > > (or > > > > > wait for someone less lazy than me to link you to it). > > > > > > > > > > tyler > > > > > > > > >
RE: Merge question
> 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
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 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 >
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:coolbreeze...@googlemail.com] Sent: Friday, March 05, 2010 1:36 PM To: users@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 mailto:bob.arc...@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
Re: Merge question
Again thank you. On Fri, Mar 5, 2010 at 1:47 PM, Bob Archer wrote: > Probably a branch rather than a tag. Generally by convention you don't > want to commit to tags. > > > > BOb > > > > > > *From:* CoolBreeze [mailto:coolbreeze...@googlemail.com] > *Sent:* Friday, March 05, 2010 1:36 PM > *To:* users@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 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 > > >
