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

Re: Suggestions for Merge Dialog

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Thu, 03 Jan 2008 09:50:45 +0100

Damian L. Powell wrote:

> When 'Merge a range of revisions' is selected:
>
> 1. It would be helpful if the 'URL to merge from' field would default to
> the location that this branch was copied from.

We could do that, yes. But:
1) this information can only be obtained if the server supports merge
tracking (otherwise it would take ages to find out)
2) even with merge tracking, it would take a few seconds to get that
information
3) it already defaults to the last used URL. That means once you've
entered that url yourself, the next time you do a merge it will already
default to that url.

> 2. It would be helpful if the 'Revision range to merge' field would
> default to the next revision after the latest revision that was
> previously merged into this branch, up to HEAD.

I don't see a real benefit here:
* without merge tracking, that information is not available
* with merge tracking however, you don't need it: simply merge
everything (i.e., you can leave the revision range field empty).

> 3. When the 'Show log' button in the 'Revision range to merge' group box
> is clicked, it would be helpful if there was a visual queue to say which
> revisions have already been merged into this branch for items under the
> 'URL to merge from' directory. (#1) (#2)

There is, but only if the server supports merge tracking.

> #1: Didn't the log used to do this in earlier nightly builds? I have a
> vague memory of seeing a whole bunch of grey log entries at some point
> and I'm sure it was when I was browsing the log to find my last-merged
> revision.

It still does. But as mentioned above, only if the server supports merge
tracking too. If the server doesn't then the required information is not
available and can't be shown.

> #2: Actually, it would be useful when browsing the log on a branch if
> there was an obvious visual queue at the point where the branch was
> created. Perhaps by greying out everything below the revision where the
> 'For complete history...' message appears or by leaving that message row
> in the log but changing the message to 'Branch created from /trunk at
> revision N' or something.

I'll think of something to indicate this better.

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_tortoisesvn.tigris.org
For additional commands, e-mail: dev-help_at_tortoisesvn.tigris.org
Received on 2008-01-04 02:53:50 CET

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