[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-14 09:27:44 CET

(Sorry if this get's posted twice).

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

> > What do you suggest? I only came up with a minor change:
>
> Given that the SVN Book talks about a merge operation finding the diff between
> two trees and applying it to a path, how about the sections of the UI be called
> something like "From Tree", "To Tree" and "Apply changes to path"?

So you create a patch between two trees and apply it to a third ...

SteveKing <steveking@gmx.ch> writes:

> Jens Scheidtmann wrote:
[...]
> > Create patch
> > starting with:
> > ending with:
> > Merge (patch) into:
>
> But then we'd have problems with users familiar with the CL client. A
> patch isn't merging!

... but this would confuse users (BTW "create a diff" has the same
problems) and as I am not completely satiesfied with the merge3.png
proposal, how about calling it a "change set"?
(cf. http://subversion.tigris.org/project_faq.html#changesets )

I suggest a merge dialog like this

Apply Change set
  From tree:
  To tree:
to working copy at url: <url>

This is sometimes also used on the svn dev mailing list:
"Apply changes of rev XYZ" meaning the changeset from revision XYZ - 1
to XYZ (in that order).

I don't mind, where the " use url for 'to tree' " check box is placed.

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 Fri Jan 14 09:28:42 2005

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