>>>> 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.
>>> Are the lines really missing in the file after resolving the conflict?
>> They are really missing. The resulting (unresolved) file looked like:
>> --- schnipp ---
>> <<<<<<< .mine
>> /(The complete content of the mine-file here)/
>> =======
>> /(The content of the theirs-file here minus a couple of hundred lines at the end)/
>>>>>>>>> .r#####
>> --- schnapp ---
>> It didn't even seem like there had been any effort to insert the
>> conflict markers around the conflicting parts of the files, but simply
>> marked the entire file contents as conflicting.
> In that case, it's a problem in the svn library. You could try reporting
> it on the svn dev list. But be prepared to get insulted.
I feared/suspected as much. In that case I will wait until I have a 100% recipe to reproduce it...
Hans-Emil
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=757&dsMessageId=2624446
To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2010-06-22 08:58:54 CEST