Author: danielsh Date: Sat Apr 14 17:26:01 2018 New Revision: 1829155 URL: http://svn.apache.org/viewvc?rev=1829155&view=rev Log: release.py create-tag: Fix an out-of-date error when the branch has changed after the magic revision.
* tools/dist/release.py (create_tag): Use HEAD rather than the magic revision as the base revision for the "Post-release housekeeping" commit. Review by: julianfoad Modified: subversion/trunk/tools/dist/release.py Modified: subversion/trunk/tools/dist/release.py URL: http://svn.apache.org/viewvc/subversion/trunk/tools/dist/release.py?rev=1829155&r1=1829154&r2=1829155&view=diff ============================================================================== --- subversion/trunk/tools/dist/release.py (original) +++ subversion/trunk/tools/dist/release.py Sat Apr 14 17:26:01 2018 @@ -832,11 +832,14 @@ def create_tag(args): (args.version.major, args.version.minor, args.version.patch + 1)) + HEAD = subprocess.check_output(['svn', 'info', '--show-item=revision', + '--', url]).strip() + HEAD = int(HEAD) def file_object_for(relpath): fd = tempfile.NamedTemporaryFile() url = branch + '/' + relpath fd.url = url - subprocess.check_call(['svn', 'cat', '%s@%d' % (url, args.revnum)], + subprocess.check_call(['svn', 'cat', '%s@%d' % (url, HEAD)], stdout=fd) return fd @@ -850,7 +853,7 @@ def create_tag(args): svn_version_h.seek(0, os.SEEK_SET) STATUS.seek(0, os.SEEK_SET) - subprocess.check_call(['svnmucc', '-r', str(args.revnum), + subprocess.check_call(['svnmucc', '-r', str(HEAD), '-m', 'Post-release housekeeping: ' 'bump the %s branch to %s.' % (branch.split('/')[-1], str(new_version)),