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

Re: [TSVN] Problem: Branch from working copy with modified files

From: Norbert Unterberg <nunterberg_at_gmail.com>
Date: 2005-08-05 18:22:39 CEST

2005/8/5, SteveKing <steveking@gmx.ch>:
> > --> Error message: File not found: revision 3, path
> > '/branches/test/dir1/test2.txt'
>
> Thanks a lot for the detailed recipe!
> Fixed in revision 4082.

I assume it is fixed in the merge dialog as well, which had exactly
the same problem?

If not, try this:

Run the same script again
Then try to merge the branch back into the trunk:
 * Select Merge on the c:\xx\wc folder
 * Merge from: file:///c:/xx/repo/branches/test
 * Show log and select the revision 4 (we try to merge the changes
from the branch creation into trunk)
 * Hit on Dry Run.
--> File not found: revision 3, path '/branches/test/dir1/test2.txt'
  
Norbert

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Fri Aug 5 18:22:56 2005

This is an archived mail posted to the TortoiseSVN Dev mailing list.