Teach "stg assimilate" to repair patch reachability

[stgit] / stgit / main.py

diff --git a/stgit/main.py b/stgit/main.py
index 2390110..2c8716b 100644 (file)
--- a/stgit/main.py
+++ b/stgit/main.py
@@ -22,7 +22,7 @@ import sys, os
 from optparse import OptionParser
 
 import stgit.commands
-from stgit.utils import out
+from stgit.out import *
 
 #
 # The commands map
@@ -68,6 +68,7 @@ commands = Commands({
     'clone':            'clone',
     'commit':           'commit',
     'cp':              'copy',
+    'edit':             'edit',
     'export':           'export',
     'files':            'files',
     'float':            'float',
@@ -130,6 +131,7 @@ stackcommands = (
     )
 patchcommands = (
     'delete',
+    'edit',
     'export',
     'files',
     'fold',