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

Re: Can't merge branch back to trunk.

From: Mark Phippard <MarkP_at_softlanding.com>
Date: 2005-08-09 22:27:01 CEST

"Royce Fessenden" <rfessenden@dmp.com> wrote on 08/09/2005 04:16:00 PM:
> After creating a branch and committing changes to it, the branch was renamed, > then additional changes were committed. Now I need to merge changes from > before and after the rename back into the trunk. Unfortunately, on all ranges> I get a “Error: file not found … “ message.> > The log shows the changes, and I can diff all the changes. (I’m using > TortoiseSVN 1.2.1 as a client, the server is also 1.2.1).> > Any suggestions on resolving this problem?
You should provide more details about what you are providing for parms to the merge command. You may need to do this in multiple merges. Let's say you made the branch at r100, committed to it at r101 renamed it at r102 and committed again at r103. You would probably need to merge this in two commands:
svn merge r100:101 url://old_branch_name@100 wc
svn merge r102:103 url://new_branch_name wc
For the first command, I am showing the peg revision syntax. In theory, this command should work too:
svn merge r100:101 url://new_branch_name wc

_____________________________________________________________________________Scanned for SoftLanding Systems, Inc. by IBM Email Security Management Services powered by MessageLabs. _____________________________________________________________________________
Received on Tue Aug 9 22:28:47 2005

This is an archived mail posted to the Subversion Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.