Re: Merge problem SVN 1,8

On 03.07.2014 16:55, Markus Humm wrote:
> Hello,
>
> I tested merging today and I have a quite severe issue with it. Here's my setup and what I did:
>
> 1. VisualSVN Server 2.7.4, so it's SVN 1.8 compatible
> 2. Current TortoiseSVN on client side
> 3. TortoiseSVN set up according to this FAQ entry:
> http://tortoisesvn.net/faq.de.html#noautomerge
> Which means, I never want automatic changes of
> my files.
> 4. As merge tool WinMerge is set up like this:
> C:\Program Files (x86)\WinMerge\WinMergeU.exe /e /s
> /u /dl %tname /dr %merged %theirs %merged

And that's your whole problem right there!
WinMerge despite its name is not a merge tool but only a diff tool. It
can only show you the diff between two files.
But for merging, you need a tool that's capable of showing the diff of
three files.

And that's why your merge fails.

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest interface to (Sub)version control
    /_/   \_\     http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=3084491
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].