Try to avoid some bad filenaming in rare cases.

diff --git a/wscript b/wscript
index 5c729bd4326c0428471a3a7f7d0038c98524bf28..239f45bf805b3b408dfb48a9737889321185f0b1 100644 (file)
--- a/wscript
+++ b/wscript
@@ -47,7 +47,7 @@ if not isinstance(this_version, str):
 if not isinstance(last_version, str):
     last_version = last_version.decode('utf-8')
 
-if this_version == '':
+if this_version == '' or this_version == 'merged-to-main':
     VERSION = '%sdevel' % last_version[1:].strip()
 else:
     VERSION = this_version[1:].strip()