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

Re: 1.8.x backport conflicts bot is red

From: Philip Martin <philip.martin_at_wandisco.com>
Date: Sat, 28 Feb 2015 13:32:48 +0000

Branko Čibej <brane_at_wandisco.com> writes:

> The error message is:
>
> 1.8.x-r1659867 (Fix reproducable memory corruption and unneeded io
> errors on editor abort): Revisions 'r1660091, r1660097' nominated but
> not included in branch
>
> I think the fix is obvious; Philip, I think you nominated those two
> revisions? Do you want to update the backport branch, too?

Those two revisions were committed directly to the branch and there is
no corresponding trunk revision to merge. I could change the proposal
but I don't know if the backport script would then interpret Daniel's
vote for the other revisions as approving the whole backport:

Index: ../src-1.8/STATUS
===================================================================
--- ../src-1.8/STATUS (revision 1662924)
+++ ../src-1.8/STATUS (working copy)
@@ -88,7 +88,7 @@
      +0: danielsh (hard to review all potential causes of expanded_size==0 in
                    7*3*2 cases (1.1…1.8) × (file/dir/prop rep) × (plain/delta))
 
- * r1659867, r1659869, r1660091, r1660097
+ * r1659867, r1659869
    Fix reproducable memory corruption and unneeded io errors on editor abort
    Justification:
      Reproducible double free(), which is undefined behaviour. Details:
@@ -103,6 +103,7 @@
    Notes:
      'svn import -mm | (sleep 2; cat)' followed by ^C at the right time was
      the reproduction.
+ r1660091, r1660097 included on branch.
    Branch:
      ^/subversion/branches/1.8.x-r1659867
    Votes:

-- 
Philip Martin | Subversion Committer
WANdisco // *Non-Stop Data*
Received on 2015-02-28 14:34:52 CET

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