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

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

From: SteveKing <stefankueng_at_gmail.com>
Date: 2005-01-13 14:41:13 CET

On 13 Jan 2005 14:34:50 +0100, Jens Scheidtmann
<Jens.Scheidtmann@bayerbbs.com> wrote:

> So the feature branch thingy can be accomplished by:
>
> - WC = trunk
> - Open Merge Dialog and use:
> From: url_to_trunk @ HEAD
> To: url_to_feature_branch @ HEAD
>
> Which would make my WC (based on trunk) contain what's in the feature
> branch.

from trunk@HEAD (which is e.g. revision 200) to feature_branch@HEAD?
Shouldn't that be the other way around (the lower revision first)?
Otherwise you would 'undo' the changes you made in the feature branch
on trunk - say hi to conflicts!

Stefan

-- 
       ___
  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 14:42:14 2005

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