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

Re: 1.5.5 next Wednesday (12/17)

From: Paul Burba <ptburba_at_gmail.com>
Date: Thu, 11 Dec 2008 16:05:01 -0500

On Wed, Dec 10, 2008 at 1:58 PM, Hyrum K. Wright
<hyrum_wright_at_mail.utexas.edu> wrote:
> 1.5.x STATUS is still pretty full, but I'm going to move forward with plans to
> roll 1.5.5 next Wednesday, Dec. 17. What's been merged by that time will be
> what's in the release, so if there are items in STATUS you want in the release,
> poke, prod, campaign or bribe people to vote on them.
> -Hyrum

There are several merge tracking related groups in STATUS right now.
It's probably too much to expect them all to be reviewed, but if
anyone wants looks at just one, here are (IMHO) the highest to lowest

 * r34091, r34094, r34244, r34256, r34306
   Various svn merge --reintegrate improvements. Even if you hate
   reintegrate, wouldn't it be nice if it was actually usable
   some of the time?

 * r34385, r34393
   Fix broken merge when the merge target's natural history includes
   resurrections. Merges that don't error out are a good thing.

 * r34432, r34669
   Follow-up to r32975, which is already backported and had a bug, see
   Fixing regressions is also good.

 * r34560, r34562
   Fix a bug which occurs when a merge adds a subtree as an immediate child
   of the merge target when the merge target has non-inheritable mergeinfo
   and is also the current working directory. If all these planets align
   properly then invalid mergeinfo is created on the added subtree.
   Ok, this is probably quite rare, but it is a bug.

 * r34547
   Fix issue #3323 'Mergeinfo deleted by a merge should disappear'
   Also fairly rare, but not dire.

 * r30257, r33024, r33026
   Don't try to filter natural history from added mergeinfo during
   reverse merges. It was suggested in IRC that this should be
   de-nominated...I won't go that far, but it makes the bottom of
   this list.


Received on 2008-12-11 22:18:09 CET

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

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