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

bug: TortoiseMerge not saving newline at end of file when changing lines

From: Ian <ianwallen_at_hotmail.com>
Date: Tue, 12 Apr 2011 05:10:00 -0700 (PDT)

There seems to be a bug with TortoiseMerge with the "use this whole file" when the line ending has changed.

Steps

- I create a file with some test and no returns.
- copy the file, edit it, and add a single return
- using explore select the copied file and then the original then right click and diff the files.
- You should see that the files are different
- In the right pane - right click and select "use this whole file" the save and close.

I expected that both files would now be identical instead nothing has changed (one has the return and one does not)

This may be related to the following.
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsMessageId=1043383&dsForumId=4061

TortoiseMerge 1.6.14, Build 21012 - 32 Bit , 2011/03/18 16:33:54
TortoiseSVN 1.6.15, Build 21041 - 32 Bit , 2011/03/23 18:00:27
Subversion 1.6.16

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2011-04-12 15:06:37 CEST

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