[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:21:23 CET

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.

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

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:22:10 2005

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