John Darrah wrote:
> On Tue, Feb 17, 2009 at 05:23:40PM -0800, FOO BONE wrote:
>> I don't believe that the:
>>
>> Version 1.5.8 - BUG: TortoiseMerge could loose line endings when saving
>> edits.
>>
>> Is completely fixed. It works better for selecting specific blocks of code
>> on a conflict; but when selecting an entire file the endlines still get
>> blown away.
>>
>> I am using 1.5.8 Build 15348
>>
>> --------------------------------------------------------------------------
>>
> Yes, I concur... 1.5.8 still concats lines during "Edit Conflicts" merge.
>
> I just created huge/many conflicted sections between two
> working copies of the same file. I then stepped thru the
> conflict sections selecting a block at a time from theirs
> until all conflicts were merged. Hit "Mark As Resolved"
> button and exit merge. Right click on file and "SVN Diff"
> everything looked OK.
>
> Repeat every thing except During merge, after selecting a
> few "Use This Text Block" from theirs, I just "Use this
> whole File" from theirs. "Mark as resolved". Exit Merge.
> "SVN Diff" on file. I see many concated lines. It appears
> that the lines at each merge conflict are concated.
>
> I can repeat this every time. The files I use are numerical
> control data files, but I suspect this is not really relevant.
Fixed in r15453.
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=1208313
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-02-22 12:21:47 CET