Re: Bug? External merge program corrupts working copy?

Greg Kopp wrote:

> Please explain why the "resolved" process MODIFIES the original copy?

It shouldn't. "Resolved" simply tells Subversion that *you* have
resolved the conflict by modifying the original file. It does this by
removing the additional files which were created during the conflict.

> What you are saying and what is happening doesn't make sense. I am
> not modifying the working copy per se, but WinMerge is modifying it.
>
> Once I click the save buttun in winmerge, the right copy changes from
> being "xxx.merge-right.rxx" to "xxx.working" on its own.

Well, that's a Winmerge issue. We don't support Winmerge - that's a
separate project. Not sure if it even knows about how Subversion handles
conflicted files or not. You have to ask on the Winmerge project about that.

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