[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:05:56 CET

news <news@sea.gmane.org> writes:

[...]
> This point sometimes causes confusion: some users have incorrectly
> assumed that the "To:" field specifies the destination for merging back
> into. The destination is always the WC from which you launched the merge
> dialog, and is shown at the top of the dialog.
>
> Maybe that means we need to tweak the UI for that dialog slightly to
> make it more obvious.

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.

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

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

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.