[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Severe merge problem with Tortoise 1.5.x

From: Thomas Börkel <tbo_at_ap-ag.com>
Date: Mon, 08 Jun 2009 08:33:17 +0200


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.


> 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?




To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-06-08 08:36:26 CEST

This is an archived mail posted to the TortoiseSVN Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.