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

RE: RE: SVN / Make Integration

From: Ulrich Eckhardt <Eckhardt_at_satorlaser.com>
Date: 2005-11-16 10:40:47 CET

William Ahern wrote:
> On Wed, 2005-11-16 at 09:49 +0100, Ulrich Eckhardt wrote:
>> William Ahern wrote:
>>> So, I'm migrating our build to a non-recursive make. One adverse
>>> side effect is that when somebody branches to fix a minor bug, in
>>> order to use build their sub-project they have to checkout the
>>> entire branch (which is huge). Previously somebody could checkout a
>>> smaller portion of a branch to do their work.
>> You still can do that. Firstly, you don't have to branch the whole
>> project when working on a module. It might be a bit cleaner but
>> depending on the amount of changes it might be "just not worth the
>> hassle". Then, you can switch parts of your normal working directory
>> to the branched module. IOW, you have a repository containing the
>> main development line with just one module being replaced with the
>> branch.
> Hmmmmm. The problem here is that some of our "modules" are actually
> composed of files and directories spread around the tree (and for
> good reason, so it's not something I can fix). Their only common
> parent directory is the root of the entire branch, so that would put
> me back at square one.

No, it doesn't, you can still use svn switch on the whole tree:

# create branch
svn copy svn://trunk/project svn://branches/project-featureX-sandbox
   -m "creating branch for featureX"
# switch working copy (current dir) to the branch
svn switch svn://branches/project-featureX-sandbox .

Since Subversion is pretty conservative regarding the use of network
bandwidth, it will only transmit the changes when switching between
trunk and branch. Further, its smart merging preserves changes, so
you can still do the above after having made the changes to the
working copy, i.e. if you decide the changes are too invasive and
you first want to try it out in a branch.


To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Nov 16 10:38:17 2005

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.