Empty result file after merge

Hello,

I noticed that carriage return (CR) and line feed (LF) in different
combinations in merge source and merge destination causes problems.

Reproducer:

*trunk

|- test.txt

contains an empty line with CR and LF at the end

*branch from trunk

test.txt

contains an empty line with LF at the end.

1. edit "branch => test.txt" and write bla before LF

2. Commit

3. Try Merge from branch into trunk

4. Resolve Conflict Dialog appears

5. Edit Conflict => TortoiseMerge doesn't show any conflict

6. Close TortoiseMerge

7. click Resolved in Resolve Conflict Dialog

8. Ok

=> local "trunk => test.txt" is modified now AND is completely EMPTY (no
CR, no LF)

My Tortoise version is 1.7.8 Build 23174 - 64Bit.

Thanks for your help

Frank

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2012-08-27 14:05:01 CEST