Commits

Lynn Rees committed 9b234ec Merge

automerge

Comments (0)

Files changed (1)

 
 
 def _test(val):
-    truth = val in ['py26', 'py27', 'py32']
+    truth = val in ['py26', 'py27', 'py31', 'py32']
     if truth is False:
         raise KeyError(val)
     return val
 def tox_recreate():
     '''recreate knife test env'''
     prompt(
-        'Enter testenv: [py26, py27, py32]',
+        'Enter testenv: [py26, py27, py31, py32]',
         'testenv',
         validate=_test,
     )
     local('hg update next')
     local('hg merge pu; hg ci -m automerge')
     local('hg update maint')
-    local('hg merge default; hg up -C; hg ci -m automerge')
+    local('hg merge default; hg ci -m automerge')
     local('hg update default')
     local('hg merge next; hg ci -m automerge')
     local('hg update pu')