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

Re: Removing leftover backport branches

From: Julian Foad <julianfoad_at_btopenworld.com>
Date: Mon, 8 Dec 2014 16:07:58 +0000

Stefan Fuhrmann wrote:
> Looking through ^/subversion/branches, I found that there are many
> backport branches that are not mentioned in any STATUS file.

> 1.8.x
> Julian: 1.8.x-r1619380 (not modified)

Ugh. Thanks for reporting this discrepancy. There is a mess here.

First, it IS modified; I committed the branch creation and modification together ;-)

It was proposed for backport, but the process went wrong.

"svn log --stop-on-copy --search 1619380 --diff" shows:

In r1619394 I "Nominate r1619380 group (diffing a copied dir with props)".

In r1619401 I "Mention the backport branch for the r1619380 group" ... by adding this to the nomination:

+   Branch:
+     ^/subversion/branches/1.8.x-r1611379

Oops, I wrote the wrong branch name (copy-and-paste-o). My apologies.

Then Bert and Stefan approve this nomination, and in r1640665 the 'svn-role' robot merges the mentioned (wrong) branch.

The r1611379 branch was for a separate nomination, "Fix revprop caching initialization delays for ra_serf on Windows". It was first mentioned in STATUS in r1612544 and was WITHDRAWN in r1620644, replaced by r1619774 "Disable the revprop caching feature".

But it has been merged anyway. So now we need to:

  * undo the merge of the 1.8.x-r1611379 branch

  * re-nominate my original nomination.

- Julian
Received on 2014-12-08 17:09:53 CET

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