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

Re: way to make merge URL default to same file/folder in repo

From: Stefan Kueng <tortoisesvn_at_gmail.com>
Date: Thu, 04 Dec 2008 17:20:40 +0100

Stephen Dewey wrote:
> This might be a feature request...
>
> When you do a revision range merge, you need to specify a URL to merge
> from. Right now, the default is the URL you used last time. I think it
> should be the URL that is your current Explorer context instead (e.g.
> what you right-clicked on, or your current folder).
>
> The reason is:
> You need to do a reverse merge to undo erroneous commits. But when you
> undo those commits, you are always doing a reverse merge only on the
> affected file itself, so you want to do the merge only from that URL.
> Otherwise, if you have to undo 25 files that were committed incorrectly,
> you may have to type the URL for each individually.
>
> (You could reverse merge an entire folder, but you might reverse merge
> some files/folders that you don't want to unless they were all in a
> single revision.)

To undo changes (i.e., do a reverse merge) the easiest way is to use the
log dialog, not the merge dialog. So your request to change the default
url is not really appropriate: most uses of the merge dialog would *not*
require the url of the selected item.

To revert changes from a specific revision, show the log for the
file/folder, select the revision you want to revert, right-click, then
choose "revert changes from this revision".

Stefan

-- 
       ___
  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=979691
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].

Received on 2008-12-04 17:21:00 CET

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

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