Re: How to merge from URL@N?

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:

5-7,20-30,66-77_at_99

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

The next nightly build will have this feature.

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2788119
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].