RE: Branch/switch/merge question

2013-11-29 Thread Edward Ned Harvey (svn4)
From: Les Mikesell [mailto:lesmikes...@gmail.com] Sent: Thursday, November 28, 2013 11:58 AM What commit log message would ever be appropriate if you commit to both the trunk and branch through an upper level directory that ties them together? I see your point of view. I'm always careful

RE: Branch/switch/merge question

2013-11-28 Thread Edward Ned Harvey (svn4)
From: Les Mikesell [mailto:lesmikes...@gmail.com] Not sure what you mean about with sparse and recursive checkouts or why you'd start with /. If there is one project in the repository you would normally just check out /trunk. Or with multiple projects, /project_name/trunk. ... see

Re: Branch/switch/merge question

2013-11-28 Thread Les Mikesell
On Thu, Nov 28, 2013 at 8:51 AM, Edward Ned Harvey (svn4) s...@nedharvey.com wrote: But I prefer to do this: svn co --depth=immediates $URL svn update --set-depth infinity project/trunk svn update --set-depth immediates project/branches svn update --set-depth infinity

Re: UNS: Re: Branch/switch/merge question

2013-11-28 Thread Andreas Krey
On Thu, 28 Nov 2013 10:58:08 +, Les Mikesell wrote: ... different people were working on the separate copies. What commit log message would ever be appropriate if you commit to both the trunk and branch through an upper level directory that ties them together? svn commit -m 'just to

Re: Branch/switch/merge question

2013-11-27 Thread Les Mikesell
On Tue, Nov 26, 2013 at 8:02 PM, Edward Ned Harvey (svn4) s...@nedharvey.com wrote: At first, I was doing a sparse checkout. I non-recursively checked out /, and then I made /trunk fully recursive, and then I went one level deeper into /branches, and then I made /branches/eharvey fully

Branch/switch/merge question

2013-11-26 Thread Edward Ned Harvey (svn4)
I've read the visual guide, the subversion book, I've used subversion for years, but never really collaborated much with other people on actual software source code the way it's intended to be used, until recently. So it's only recently that I'm making use of branch/merge, and I'd like to get

RE: Branch/switch/merge question

2013-11-26 Thread Andrew Reedick
From: Edward Ned Harvey (svn4) [mailto:s...@nedharvey.com] Sent: Tuesday, November 26, 2013 9:13 AM To: users@subversion.apache.org Subject: Branch/switch/merge question In particular, I branch (and switch) from /trunk to /branches/eharvey.  I then make a few commits.  I switch back

RE: Branch/switch/merge question

2013-11-26 Thread Edward Ned Harvey (svn4)
From: Andrew Reedick [mailto:andrew.reed...@cbeyond.net] Sent: Tuesday, November 26, 2013 9:30 AM No, but since you're the only one working on the trunk, you don't necessarily need to branch/merge. Thanks - I'm not the only person working on it. But sometimes I'll have something to

RE: Branch/switch/merge question

2013-11-26 Thread Bob Archer
I've read the visual guide, the subversion book, I've used subversion for years, but never really collaborated much with other people on actual software source code the way it's intended to be used, until recently.  So it's only recently that I'm making use of branch/merge, and I'd like to

RE: Branch/switch/merge question

2013-11-26 Thread Edward Ned Harvey (svn4)
From: Bob Archer [mailto:bob.arc...@amsi.com] Are you using svn 1.8? Oh - uhm... I'm using TortoiseSVN, 1.8.2, which is built against Subversion 1.8.3. If not, are you doing reintegration merge when merging your branch back in to the trunk? I'm not familiar with those words. Maybe

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 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 to get

Re: Merge question

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

Merge question

2010-03-04 Thread CoolBreeze
I'm getting back into using Subversion and I'm not sure how to answer a question a co-worker asked me regarding merging. Can someone please explain how the following is handled with the following repository structure of our ASP.NET Intranet site? Our repository is structured below: IntranetSite

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

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 source