subversion-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Julian Foad <julianf...@apache.org>
Subject release.py create-tag failed to update STATUS
Date Wed, 11 Apr 2018 07:21:19 GMT
Running "release.py create-tag" just now failed:

+ release.py --base-dir /opt/svnrm create-tag 1.10.0 r1827917
INFO:root:Creating tag for 1.10.0
r1828867 committed by julianfoad at 2018-04-11T07:00:33.547290Z
INFO:root:Bumping revisions on the branch
.../subversion/svnmucc/svnmucc.c:235,
.../subversion/libsvn_client/mtcc.c:1485,
.../subversion/libsvn_client/mtcc.c:1262,
.../subversion/libsvn_client/mtcc.c:1180,
.../subversion/libsvn_ra_serf/commit.c:2186,
.../subversion/libsvn_ra_serf/util.c:1032,
.../subversion/libsvn_ra_serf/util.c:981,
.../subversion/libsvn_ra_serf/util.c:946,
.../subversion/libsvn_ra_serf/multistatus.c:558: (apr_err=SVN_ERR_RA_OUT_OF_DATE)
svnmucc: E170004: Item '/subversion/branches/1.10.x/STATUS' is out of date
Traceback (most recent call last):
  File ".../tools/dist/release.py", line 1558, in <module>
    main()
  File ".../tools/dist/release.py", line 1554, in main
    args.func(args)
  File ".../tools/dist/release.py", line 854, in create_tag
    'put', STATUS.name, STATUS.url,
  File "/usr/lib/python2.7/subprocess.py", line 541, in check_call
    raise CalledProcessError(retcode, cmd)
subprocess.CalledProcessError: Command '['svnmucc', '-r', '1827917', '-m', 'Post-release housekeeping:
bump the 1.10.x branch to 1.10.1.', 'put', '/tmp/tmpAxzWoN', 'https://svn.apache.org/repos/asf/subversion/branches/1.10.x/subversion/include/svn_version.h',
'put', '/tmp/tmpUPWFkj', 'https://svn.apache.org/repos/asf/subversion/branches/1.10.x/STATUS']'
returned non-zero exit status 1

It's because it uses "svnmucc -r <REV> put <...>" but STATUS has already been
modified between r<REV> and HEAD.

I fixed the end result (updating 'STATUS') manually.

-- 
- Julian

Mime
View raw message