Author: breser
Date: Mon Dec 10 19:52:12 2012
New Revision: 1419707
URL: http://svn.apache.org/viewvc?rev=1419707&view=rev
Log:
Emit a warning rather than an error on unmerged revisions to CHANGES.
* tools/dist/release.py
(compare_changes): Replaces new lines with spaces and log unmerged revisions
as a warning.
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=1419707&r1=1419706&r2=1419707&view=diff
==============================================================================
--- subversion/trunk/tools/dist/release.py (original)
+++ subversion/trunk/tools/dist/release.py Mon Dec 10 19:52:12 2012
@@ -374,7 +374,10 @@ def compare_changes(repos, branch, revis
if stderr:
raise RuntimeError('svn mergeinfo failed: %s' % stderr)
if stdout:
- raise RuntimeError('CHANGES has unmerged revisions: %s' % stdout)
+ # Treat this as a warning since we are now putting entries for future
+ # minor releases in CHANGES on trunk.
+ logging.warning('CHANGES has unmerged revisions: %s' %
+ stdout.replace("\n", " "))
def roll_tarballs(args):
'Create the release artifacts.'
