[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: Fri, 08 Jul 2011 18:59:16 +0200

On 08.07.2011 10:08, Ryan J Ollos wrote:
> With the SVN client I can merge from URL_at_N:
> svn merge sourceURL1[@N] [WCPATH]
> I've tested this and it works for the specific situation that I've
> encountered: I created BranchB from BranchA, and BranchA had been created
> from the trunk. After several commits on both branches, BranchA was
> reintegrated to the trunk and BranchA was deleted. I wanted to merge the
> work from BranchA to BranchB before reintegrating BranchB, but I BranchA has
> been deleted at revision N+1. I could do this with the command line client:
> svn merge BranchA_at_N WC
> I could not figure out how to do this with TSVN.
> http://old.nabble.com/file/p32019597/MergeRevisions.png
> Appending @N to the URL doesn't work. It seems like there needs to be a
> dialog box for entering a revision. Entering a range of revisions doesn't
> seem to work, because TSVN seems to be trying to merge that range of
> revisions while looking for the existence of the branch at the HEAD
> revision.

Try the next nightly build. I'll commit a change in a few minutes that
allows to specify the peg revision in the revision range string at the end:


the peg revision can be added at the end, indicated with an '@' char.

The next nightly build will have this feature.


   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-08 18:59:33 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.