[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: TMerge does not show all conflicts?

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Sun, 18 Nov 2012 16:39:15 +0100

On 17.11.2012 19:33, Sven Strickroth wrote:
> If I run TMerge with the following command no merge conflict is shown.
>
> bin\TortoiseMerge.exe /base:"D:\tst\src\Changelog.txt.BASE.txt" /theirs:"D:\tst\src\Changelog.txt.REMOTE.txt" /mine:"D:\tst\src\Changelog.txt.LOCAL.txt" /merged:"D:\tst\src\Changelog.txt" /basename:"BASE" /theirsname:"REMOTE" /minename:"LOCAL" /mergedname:"Changelog.txt"
>
> If I switch mine and theirs, the conflict is shown as expected.
>
> Is this intended behavior?

I don't get a conflict at all. Whether I change /mine: and /theirs
doesn't matter.

What version are you using?
 From the changes I see in the files, whether there's a conflict depends
on whether you diff line-by-line or do it block wise.

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=3029194
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2012-11-18 16:39:24 CET

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