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

Re: Subversion 1.5.5 - reintegrate fix

From: Mark Phippard <mphippard_at_collab.net>
Date: Tue, 6 Jan 2009 09:35:37 -0500

On Tue, Jan 6, 2009 at 9:28 AM, David Aldrich <David.Aldrich_at_eu.nec.com> wrote:

> The svn 1.5.5 release notes include the change:
> * improve performance of 'svn merge --reintegrate' (r34091, -4, and others)
> I am trying to decide whether 1.5.5 is a critical update for us. We do use the reintegrate merge feature. Is this change purely a performance improvement, or could reintegrate produce wrong results in earlier releases?

The fix really was not related to performance. What the fix did was
correct the problems where reintegrate refuses to run because you have
subtree mergeinfo. It now does a more intelligent examination of the
content of that mergeinfo to determine when it is OK that it exists.

The merge itself is not changed at all, it is just the checking that
reintegrate does before it runs the merge.

IMO, 1.5.5 is a critical release and it should be applied to clients.
If you successfully use reintegrate today, then these specific fixes
will not matter to you, but there were other changes that are
significant. For example, local copy/move no longer creates the
mergeinfo that causes so many of the annoyances in earlier 1.5.x

Mark Phippard
Received on 2009-01-06 15:36:32 CET

This is an archived mail posted to the Subversion Users mailing list.

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