Re: Severe merge problem with Tortoise 1.5.x

Thomas Börkel wrote:
> HI!
>
> Stefan Küng wrote:
>
>>> If this is already fixed in 1.6.x, it would not really help us, because
>>> we cannot force all our customers to update to 1.6 now.
>> Just fixed this in r16526.
>
> Great!
>
>> But why would you need to force your *customers* to update to 1.6?
>
> Our product features an online update mechanism based on Subversion 1.5.
> We are providing the source of our product and at the customer site,
> standard fixes from us and customization from/for the customer are being
> merged in the source. And this bug is a problem for the merge process.
> So, when the bug is fixed only in Tortoise 1.6.x, then we would have to
> install 1.6.x everywhere. That would mean not only Tortoise, but also
> the command line client and possibly an update to our product.
>
> 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.

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