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

Can't merge branch back to trunk.

From: Royce Fessenden <rfessenden_at_dmp.com>
Date: 2005-08-09 22:16:00 CEST

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?


Royce Fessenden


417 831-9362 ext 111

Received on Tue Aug 9 22:17:53 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.