Re: Merge question

2010-03-05 Thread CoolBreeze
*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 > ch

RE: Merge question

2010-03-05 Thread Bob Archer
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

Re: Merge question

2010-03-05 Thread CoolBreeze
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

RE: Merge question

2010-03-05 Thread Bob Archer
> 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

Re: Merge question

2010-03-05 Thread CoolBreeze
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

Re: Merge question

2010-03-04 Thread Tyler Roscoe
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

2010-03-04 Thread Bob Archer
> 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 > >

Re: Merge question

2010-03-04 Thread Tyler Roscoe
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