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

How to merge from URL@N?

From: Ryan J Ollos <ryano_at_physiosonics.com>
Date: Fri, 8 Jul 2011 01:08:49 -0700 (PDT)

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.


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

I tried this with TortoiseSVN 1.6.99, Build 21662 - 64 Bit -dev, 2011/07/06

View this message in context: http://old.nabble.com/How-to-merge-from-URL%40N--tp32019597p32019597.html
Sent from the tortoisesvn - users mailing list archive at Nabble.com.
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2011-07-08 10:08:58 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.