[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: Steve Suehs <csuehs_at_drillinginfo.com>
Date: Wed, 10 Dec 2008 16:16:39 -0600

May we please have a fix for
http://subversion.tigris.org/issues/show_bug.cgi?id=3262
in subversion 1.5.5?

It appears that an application of r30756 on the trunk to the 1.5.x
branch would fix it. I admit to not having run regression tests.

--- subversion/libsvn_wc/merge.c (revision 34661)
+++ subversion/libsvn_wc/merge.c (working copy)
@@ -245,7 +245,7 @@
                                       pool));
       SVN_ERR(svn_subst_copy_and_translate3(old_target,
                                             tmp_new,
- eol, eol ? FALSE : TRUE,
+ eol, TRUE,
                                             NULL, FALSE,
                                             FALSE, pool));

On Wed, 2008-12-10 at 10:58 -0800, Hyrum K. Wright 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
>
> ------------------------------------------------------
> http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=982393

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=982573
Received on 2008-12-10 23:18:19 CET

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