Re: Nightly build merge problem

On 18.06.2010 12:55, Hans-Emil Skogh wrote:
> 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.

Do you resolve the conflict with TMerge or using the "resolve using..."
entries in the context menu?
If TMerge, do you maybe have the view set to "collapse"?
Are the lines really missing in the file after resolving the conflict?
Or just not shown in TMerge?

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=757&dsMessageId=2623457
To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].