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

[TSVN] Re: TSVN Merge issue vs. "Feature Branches" in SVN book

From: Simon Large <slarge_at_blazepoint.co.uk>
Date: 2005-01-13 19:07:15 CET

Dave Peterson wrote:
> Simon Large <slarge <at> blazepoint.co.uk> writes:
>
>> However, all the examples in the SVN book actually use the alternate
>> form and there is a warning in the "Common Use Cases for Merging"
>> section about doing it that way. Normally you want to merge a range
>> of changes from your branch back into the trunk (or vice versa).
>
> Admittedly, I'm not an SVN or TSVN expert, but from my reading of the
> SVN book it sounds like they have two patterns of doing development
> within branches.

Well for a non-expert, that sounds a pretty good explanation to me :-)

I just discovered that the online version of the SVN book contains this
info, whereas the older (December) help file on my PC doesn't.

> FWIW, I'm trying to do the second pattern because we have some large
> features that will take awhile to develop but we don't want to get
> too out of sync with the trunk -- that would risk alot of conflicts
> and problems. Unless I'm missing something, if we sync our banch to
> the trunk periodically, then the only way to find the changes made in
> just our branch is to diff the two head revisions.

Now that I understand the merging model, I can see why you want to do it
this way. Let us know if you can come up with a reproduction recipe.

Simon

-- 
       ___
  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Thu Jan 13 19:23:30 2005

This is an archived mail posted to the TortoiseSVN Dev mailing list.