[Jython-checkins] jython (merge default -> default): Merged trunk
jim.baker
jython-checkins at python.org
Wed Mar 14 19:28:53 CET 2012
http://hg.python.org/jython/rev/55230545a960
changeset: 6361:55230545a960
parent: 6360:b4b0aa148654
parent: 6359:c2184b0d2778
user: Jim Baker <jbaker at zyasoft.com>
date: Wed Mar 14 11:28:45 2012 -0700
summary:
Merged trunk
files:
.hgsubstate | 2 +-
Misc/applypatches.py | 7 +++----
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/.hgsubstate b/.hgsubstate
--- a/.hgsubstate
+++ b/.hgsubstate
@@ -1,1 +1,1 @@
-88741 CPythonLib
+88850 CPythonLib
diff --git a/Misc/applypatches.py b/Misc/applypatches.py
--- a/Misc/applypatches.py
+++ b/Misc/applypatches.py
@@ -34,12 +34,11 @@
if succeeded:
print '\nThe following files were successfully patched:'
- for path in succeeded:
- for path in succeeded:
- print path
+ for path in sorted(succeeded):
+ print path
if failed:
print '\nPatching failed for the following files:'
- for path in failed:
+ for path in sorted(failed):
print path
print '\nYou will need to migrate these modules manually.'
--
Repository URL: http://hg.python.org/jython
More information about the Jython-checkins
mailing list