[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: Wed, 13 Jul 2011 21:09:50 +0200

On 13.07.2011 06:23, Ryan J Ollos wrote:
> Stefan Küng wrote:
>> 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.
> Sorry for the delayed reply here. I've tested again with build 21674.
> With the command line client I can do the following merge, specifying a PEG
> revision and not specifying a revision range:
> svn merge [URL]@N [WC]
> and revisions M-N are merged for the case that a merge was previously
> performed for all revisions up to revision M-1.
> With the TSVN client, if I specify just a PEG revision, the message in the
> merge window is:
> Merging revisions 1-HEAD of URL_at_N into WC, respecting ancestry
> '/repos/psi/!svn/bc/6784/Projects/Presto/Software/branches/T850-AO' path not
> found
> However, if I specify a revision range and a PEG revision (`1-N_at_N` in the
> `Revision range to merge` text box), the merge proceeds correctly:
> Merging revisions 0-N of URL_at_N into WC, respecting ancestry
> If I'm looking at this correctly, it seems that in the case that only a PEG
> revision is specified, the merge should be performed for revisions 0 through
> the PEG revision, not 0 through HEAD.

Thanks for the analysis.
Done in r21679.


   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-13 21:10:00 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.