Nightly build merge problem

Hi!
 
I'm seeing some strange behaviour in the nightlies for a week or so. I'm trying to merge a small change in a file from one branch to another. The merge is marked as conflicted, and when I try to resolve it it looks like that the last couple of hundred lines in the "theirs" file is simply missing. This has happened two times in aprox 20 merged files. This does not happen with the latest official tortoise release.
 
Sorry for the poor quality of the reports right now... If anything is unclear please ask or give some advice what I can try to narrow the scope of the bug down.
 
Hans-Emil

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

To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2010-06-18 12:56:12 CEST