[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:34:50 CET

SteveKing <stefankueng@gmail.com> writes:

> On 13 Jan 2005 14:05:56 +0100, Jens Scheidtmann
> <Jens.Scheidtmann@bayerbbs.com> wrote:
> [...]
> > How about reordering the merge dialog:
> >
> > Merge changes
> >
> > |- From ----
> > | ...
> > |-----------
> >
> > |- To ------
> > | ...
> > |-----------
> >
> > into the current working copy, which points to the URL.
> >
> > that's how I understand the merge dialog.
>
> What's the difference to what it is now? Sorry I can't see quite what
> you mean with this.

Currently it is:

-start dialog-------------------------------
Merge changes into the curent WC which points to the URL:
<URL>

|- From ----
| ...
|-----------

|- To ------
| ...
|-----------

[ ] Dry Run
 
              OK Cancel Help
-end dialog-------------------------------

Make it like this:

-start dialog-------------------------------
Merge changes

|- From ----
| ...
|-----------

|- To ------
| ...
|-----------

into the curent WC which points to the URL:
<URL>

[ ] Dry Run
 
              OK Cancel Help
-end dialog-------------------------------

ie. move the "into the current WC .... <URL>"
labels / strings below the from and to boxes.

Jens

> > I think the "svn merge url1 url2" scenario discussed above is
> > something which should be (is?) implemented in the repo browser, as
> > it is done on the server (AFAICT).
>
> No!
> Merging is something that's _never_ done on the server.

Good to know.

> svn merge url1 url2
> merges the changes from url1 (which is e.g. a copy from trunk at rev
> 100) to url2 (which is e.g. a copy from trunk at rev 200) into the
> working copy.
> In the example case, it would be equivalent to
> svn merge http://server.com/repos/trunk -r100:200

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.

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:35:49 2005

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