Re: Merge local file diffs

Sven Kirchner wrote:
> It would probably work if I create a temporary branch, check in
> (overwrite) the files I was sent and do a merge from there. But that
> doesn't really feel right.

TSVN->UpdateToRevision (your guess at what the author used).
Overwrite the file with the submitted one.
TSVN->CreatePatch
TSVN->Revert
TSVN->Update
TSVN->ApplyPatch

Messy, but it should work.

Simon

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org