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

Re: How to merge from URL@N?

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Sat, 09 Jul 2011 09:28:55 +0200

On 09.07.2011 08:45, Ryan J Ollos wrote:

> I've installed `TortoiseSVN 1.6.99, Build 21671 - 64 Bit -dev, 2011/07/08
> 19:54:24`.
> The text below the `Revision range to merge` text box now shows that it is
> possible to specify @pegrevision, but it doesn't seem to be working for me.

What doesn't work?
I've tried this on my test working copies and the peg revision is passed
correctly to the svn_client_merge_peg4 API.

> As a confirmation that we are merging from a peg revision, in the merge
> dialog it would be helpful if the first line read:
> Merging revisions N-M of URL_at_PEGREVISION into WC, respecting ancestry

Done in r21672.

> whereas it currently reads:
> Merging revisions N-M of URL into WC, respecting ancestry
> A feature that might be user friendly would be:
> * User opens Repository Browser from the Merge dialog to select a URL.
> * User changes the Revision when browsing the repository and then selects a
> directory.
> * In response to the user selecting a directory, TSVN populates the `URL to
> merge from` text box. Perhaps TSVN should also populate the `Revision range
> to merge` with @PEGREVISION as well.
> Here is a screen capture to better show what I'm talking about:
> http://old.nabble.com/file/p32026345/Merge.png Merge.png

the problem with this approach is that the url is usually set first, and
*then* the revisions are set. So populating the revision box with the
peg revision might confuse users.


   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2011-07-09 09:29:09 CEST

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.