AW: TortoiseMerge produces unpredictable result

I've just used tortoisehg, created a dummy merge and used p4merge to resolve
conflicts. It showed me common changes (see attachments).

"bla.zip" actually contains the dummy mercurial repository.

Cheers

>-----Ursprüngliche Nachricht-----
>Von: Stefan Küng [mailto:tortoisesvn_at_gmail.com]
>Gesendet: Samstag, 22. Juni 2013 10:48
>An: dev_at_tortoisesvn.tigris.org
>Betreff: Re: TortoiseMerge produces unpredictable result
>
>On 22.06.2013 00:19, Sven Strickroth wrote:
>> When merging with the supplied files (and an empty my.txt), TMerge
>> does not show a one-line diff on the left (their) side. - Instead it
>> shows that all lines are deleted and added.
>
>Spent the last hour stepping through the code until I realized: that's
>the correct behavior.
>
>Since my.txt is empty, all lines are actually in conflict.
>Have a look at the image here:
>http://tortoisesvn.net/docs/release/TortoiseMerge_en/tmerge-basics-
>conflicts.html
>
>the TMerge views are shown like this:
>left view : diff between "theirs" and "base"
>right view: diff between "mine" and "base"
>But this is shown the same way as "one pane view" in two-file diff mode.
>
>I'm not sure what you expect TMerge to show instead? Do you have a
>screenshot of another diff/merge tool that does this better?
>
>Stefan
>
>--
> ___
> oo // \\ "De Chelonian Mobile"
> (_,\/ \_/ \ TortoiseSVN
> \ \_/_\_/> The coolest interface to (Sub)version control
> /_/ \_\ http://tortoisesvn.net
>
>------------------------------------------------------
>http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=757&dsMessag
>eId=3058811
>
>To unsubscribe from this discussion, e-mail: [dev-
>unsubscribe_at_tortoisesvn.tigris.org].

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=757&dsMessageId=3059019

To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].

• application/x-zip-compressed attachment: bla.zip