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

Re: TMerge bug when adding text by hand

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Mon, 15 Jun 2009 17:57:17 +0200

David Balažic wrote:
> TortoiseMerge 1.6.2, Build 16344 - 32 Bit , 2009/05/09 13:46:29
>
> Change a file by removing a few files:
> - old file:
> one
> two
> three
> four
>
> - new file:
> one
> four
>
> Compare them.
>
> In the left pane add some text in the removed area:
>
> one
> ADD HERE
>
> four
>
>
> Press ctrl-s.
> Press F5.
>
> Expected result:
> one
> ADD HERE
> <no line here, but space in TMerge right pane>
> four
>
> Actual result (the new file, as shown in TMerge and saved to disk - verified by loading into notepad):
> one
> ADD HEREfour
>
>
> The problem is, that the new added text is merged by the following (unchanged) line.

Thanks for the report!

Fixed in r16599.

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

Received on 2009-06-15 17:58:06 CEST

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