[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: Daniel Shahaf <d.s_at_daniel.shahaf.name>
Date: Sat, 28 Feb 2015 21:50:09 +0000

Philip Martin wrote on Sat, Feb 28, 2015 at 18:12:47 +0000:
> Bert Huijben <bert_at_qqmail.nl> writes:
>
> > I would have expected that the backport script would *only* look at
> > the branch, as that is what would have to be merged once accepted.
>
> I suppose I could do the trivial merge from trunk and generate a
> mergeinfo change on the branch. That would probably satisfy the
> backport script.

Why are you *guessing* how the script works? If something is not clear,
please ask, so the documentation may be improved.

The bits you speculated about are documented here (this is the old
documentation, before today's patch):

     % ./tools/dist/backport.pl --help | me
     Both batch modes also perform a basic sanity-check on entries that declare
     backport branches (via the "Branch:" header): if a backport branch is used, but
     at least one of the revisions enumerated in the entry title had not been merged
     from ^/subversion/trunk to the branch root, the hourly bot will turn red and
     nightly bot will skip the entry and email its admins. (The nightly bot does
     not email the list on failure, since it doesn't use buildbot.)

If there are any other questions about backport.pl, how it works, etc.,
I'd be happy to answer. Fire away.

Cheers,

Daniel
Received on 2015-02-28 22:52:52 CET

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