[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-13 11:39:12 CEST

Norbert Unterberg wrote:
> 2005/8/6, SteveKing <steveking@gmx.ch>:
>
>>> * 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.
>
>
> But you can with the command line client. Remember that I created the
> branch from a modified working copy, so the changeset 4 contains both
> the branch creation and file modifications. How do I merge these
> modifications back into the trunk?
>
> The command line client does allow something like
> svn diff -r3:4 file:///c:/xx/repo/branches/test, but TSVN does not.

Changed TSVN to use the end revision of the merge as the peg revision.
Now this works.
(Done in revision 4141)

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 13 11:39:33 2005

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