Re: Severe merge problem with Tortoise 1.5.x

Thomas Börkel wrote:
> HI!
>
> Stefan Küng wrote:
>> Thomas Börkel wrote:
>
>>> Could you please backport the fix to 1.5? Or is it straighforward to
>>> cmopile Tortoise ourselves?
>> We don't support 1.5.x anymore, sorry.
>> You can try to build 1.5.x yourself if you like. The build instructions
>> are in the build.txt file in the TSVN root directory.
>
> Looks as not being too easy. ;-)
>
> Can you say, when in 1.5.x this bug emerged? So, maybe we can downgrade
> to an older 1.5.x version.

It's been there for a long time now, even in 1.5.0.

But: that bug only triggers if the merge itself returns with an error -
and conflicts are not considered a failed merge so it won't return with
an error because of that. So maybe there's another problem with your
merge here (or with your network setup) that makes a merge fail (maybe a
virus scanner blocking a file so the merge can't access a file?).

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=2360981
To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].