Re: Bug? External merge program corrupts working copy?

Greg Kopp wrote:
> I appreciate the clarification on how this is supposed to work.
>
> But, when I use the "Resolved" menu item, it DOES modify the original
> file. It doesn't merely delete the temporary files.

The "Resolved" operation does *not* modify the original file. It gets
modified during the conflict. You can read about how it gets changed in
our docs.
When you resolve a conflict with Winmerge, you must save the result file
over your original file. Or, you can manually edit the original file,
which has the conflict markers in it.

> Is there any reason why TortoiseMerge doesn't support Unicode? Who are
> the developers on that part of the project? If Tortoise Merge supported
> at least some Unicode Code Pages, I wouldn't be having this dilemma. :-)

TortoiseMerge does support UTF8 and ANSI. But not UTF16 or UTF32. The
reason for this is that the Subversion diff library doesn't support
those, and TortoiseMerge uses that diff library.
But UTF8 will work just fine.

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