[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: SteveKing <steveking_at_gmx.ch>
Date: 2005-08-06 09:41:49 CEST

Norbert Unterberg wrote:
> 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)

But revision 4 is the latest revision on that branch. So there aren't
really any changes to merge!
If for example you do a commit to that branch, you could then merge
*that* change back to trunk with
startrevision: 4
endrevision: 5

> * Hit on Dry Run.
> --> File not found: revision 3, path '/branches/test/dir1/test2.txt'

Of course. If you select revision 4 in the log dialog, TSVN
automatically fills in revisions from:3 to:4 - and in revision 3 the
branch didn't exist yet. You can't merge the branch creation.

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Sat Aug 6 09:42:07 2005

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