[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

[TSVN] Another idea for the Merge pot

From: Simon Large <slarge_at_blazepoint.co.uk>
Date: 2005-01-20 15:57:50 CET

Hi Folks,

It seems that _one_ of the common uses of merging is to merge a single
revision from trunk to branch, which is what we have been doing a lot of
in the last week or so. It would be nice if there were a simple way of
doing this by specifying the source tree and the actual revision to
merge (rather than specify N-1, then specify N).

We already have a very nice shortcut for doing this in reverse:
ShowLog, right-click on a revision and select "Revert changes from this
revision", which effectively executes svn merge N:N-1 for the working
copy URL.

Doing it for a trunk to branch merge is almost as easy, except that you
need to select a source tree first. The components are all there already
in the existing merge dialog, it's just a slightly different use of
them.

I don't know how this fits in with Stefan's ideas, but I thought I would
throw it into the melting pot.

One of the arguments that came up in the last week is that we should be
thinking of the merge in terms of a diff between 2 trees, which would
then make the terminology more obvious. I have to disagree with that.
Diffing 2 trees is not something that is easy to do in TSVN, in fact I
don't think it is even possible. So it is not a good concept to base the
merge dialog on because it is unfamiliar to non CLI users. The SVN book
deals quite a lot in the different use cases, which is why I was trying
to use that as a starting point for the merge GUI.

BTW. If I select 2 WC folders and try to diff them in TSVN I get "Access
is denied" in TMerge. Looks like a bug.

Simon

--
       ___
  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 20 16:09:15 2005

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