Author: damoxc
Revision: 5830
Log:
fix a bug in the merge script, ensure skip is defined
Diff:
Modified: merge_changes.py
===================================================================
--- merge_changes.py 2009-10-10 09:40:24 UTC (rev 5829)
+++ merge_changes.py 2009-10-10 13:45:08 UTC (rev 5830)
@@ -28,6 +28,7 @@
if not filename.startswith('branches/%s' % branch):
continue
if mod_type == 'A':
+ skip = False
if os.path.isdir(filename):
directories.append(filename)
else:
@@ -104,7 +105,7 @@
isdir = ' (dir)'
window.addstr(index, 4, '[%s] %d. %s %s%s' % (selection, index +
1, merge_file[2], merge_file[0], isdir))
window.addstr(index + 3, 0, 'Select file(s)')
- window.addstr(index + 4, 0, '0 selects all files')
+ window.addstr(index + 4, 0, '* selects all files')
window.refresh()
key = window.getch()
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"deluge-commit" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to
[email protected]
For more options, visit this group at
http://groups.google.com/group/deluge-commit?hl=en
-~----------~----~----~----~------~----~------~--~---
