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

Re: TortoiseMerge produces unpredictable result

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Sat, 22 Jun 2013 10:47:51 +0200

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-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2013-06-22 10:47:59 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.