Re: Possible TortoiseMerge bug

On 24.09.2013 14:29, Tobias Kaes wrote:
> Hi, I've seen cases where TortoiseMerge doesn't match up left/right
> sides of changes properly anymore. On the left side it marks lines
> orange (removed) which are still there on the right side. Seems to be
> triggered when moving a snipped of code while at the same time
> replacing it with a smaller snippet. Example files + screenshot
> attached.
>
> Originally observed in 1.8.0 and updating to 1.8.2 didn't help.

Not sure why you think that's a bug.

The lines *are* removed and added again but at another location.
So TMerge correctly shows that the lines are removed at the original
location and the new line on the right.
The lines however are moved further down to a new function, and so
TMerge shows those lines added again at the new location.

TMerge is a diff tool, it does not know about functions or code or
whatever. It only knows about lines.

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=3065186
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].