[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: Jens Scheidtmann <Jens.Scheidtmann_at_bayerbbs.com>
Date: 2005-01-13 14:51:25 CET

SteveKing <stefankueng@gmail.com> writes:

> 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!

undoing changes goes like this:

- *committed* WC at location URL_OF_WC @ REV (with wrong changes)
- update WC
- merge
  From: URL_OF_WC @ REV
  to URL_OF_WC @ REV - 1

Right?

But as the feature branch@HEAD contains the changes local to it *PLUS* the
changes on trunk since the branch was made,

  From: TRUNK @ HEAD <-
  To : FEATURE_BRANCH @ HEAD <- Note same revision

is only the feature.

Jens

-- 
Jens.Scheidtmann@bayerbbs.com
---------------------------------------------------------------------
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:52:11 2005

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