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

AW: TortoiseMerge produces unpredictable result

From: Dominik Psenner <dpsenner_at_gmail.com>
Date: Tue, 25 Jun 2013 13:43:49 +0200

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.


>-----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:
>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?
> ___
> oo // \\ "De Chelonian Mobile"
> (_,\/ \_/ \ TortoiseSVN
> \ \_/_\_/> The coolest interface to (Sub)version control
> /_/ \_\ http://tortoisesvn.net
>To unsubscribe from this discussion, e-mail: [dev-


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

  • application/x-zip-compressed attachment: bla.zip
Received on 2013-06-25 17:03:17 CEST

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.