Author: hwright
Date: Wed Jul 13 13:56:03 2011
New Revision: 1146032
URL: http://svn.apache.org/viewvc?rev=1146032&view=rev
Log:
release.py: Fix a bug in finding the correct branch location.
* tools/dist/release.py
(roll_tarballs): Prepend the 'branches' directory to the branch path.
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=1146032&r1=1146031&r2=1146032&view=diff
==============================================================================
--- subversion/trunk/tools/dist/release.py (original)
+++ subversion/trunk/tools/dist/release.py Wed Jul 13 13:56:03 2011
@@ -335,7 +335,7 @@ def roll_tarballs(args):
if args.branch:
branch = args.branch
else:
- branch = args.version.base[:-1] + 'x'
+ branch = 'branches/' + args.version.base[:-1] + 'x'
logging.info('Rolling release %s from branch %s@%d' % (args.version,
branch,
args.revnum))
@@ -352,7 +352,7 @@ def roll_tarballs(args):
# Make sure CHANGES is sync'd
if branch != 'trunk':
trunk_CHANGES = '%s/trunk/CHANGES@%d' % (repos, args.revnum)
- branch_CHANGES = '%s/branches/%s/CHANGES@%d' % (repos, branch,
+ branch_CHANGES = '%s/%s/CHANGES@%d' % (repos, branch,
args.revnum)
proc = subprocess.Popen(['svn', 'diff', '--summarize', branch_CHANGES,
trunk_CHANGES],
