[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: Bert Huijben <bert_at_qqmail.nl>
Date: Sat, 28 Feb 2015 21:17:16 +0100

> -----Original Message-----
> From: Philip Martin [mailto:philip.martin_at_wandisco.com]
> Sent: zaterdag 28 februari 2015 19:13
> To: Bert Huijben
> Cc: Philip Martin; Branko ─îibej; Daniel Shahaf; Subversion Development
> Subject: Re: 1.8.x backport conflicts bot is red
>
> 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.

I don't think the backport script is really that advanced.
As far as I can tell it just tries the backport and notes problems.

In this case it should have tried the reintegrate from branch.

Daniel tweaked the script this week for some other merge problems (related to 1.9). Perhaps this is related.

        Bert
>
> --
> Philip Martin | Subversion Committer
> WANdisco // *Non-Stop Data*
Received on 2015-02-28 21:18:04 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.