>> 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.
> Do you resolve the conflict with TMerge or using the "resolve using..."
> entries in the context menu?
I tried resolving it using TortoiseMerge, but since the resulting diff was so strange (lines missing makes for an intresting diff :-) ) I selected "resolve later".
> If TMerge, do you maybe have the view set to "collapse"?
No.
> Are the lines really missing in the file after resolving the conflict?
> Or just not shown in TMerge?
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.
Hans-Emil
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=757&dsMessageId=2624102
To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2010-06-21 08:44:12 CEST