Teach "stg assimilate" to repair patch reachability

[stgit] / stgit / commands / common.py

diff --git a/stgit/commands/common.py b/stgit/commands/common.py
index 9e1f7cbc74d05ee23dd3c658d4559635a361b2bf..0fc157ad7b03e66fac5d82aa098789729d407bc9 100644 (file)
--- a/stgit/commands/common.py
+++ b/stgit/commands/common.py
@@ -113,9 +113,9 @@ def check_local_changes():
 def check_head_top_equal():
     if not crt_series.head_top_equal():
         raise CmdException(
 def check_head_top_equal():
     if not crt_series.head_top_equal():
         raise CmdException(

-            'HEAD and top are not the same. You probably committed\n'
-            '  changes to the tree outside of StGIT. To bring them\n'
-            '  into StGIT, use the "assimilate" command')
+"""HEAD and top are not the same. This can happen if you
+   modify a branch with git. The "assimilate" command can
+   fix this situation.""")

 
 def check_conflicts():
     if os.path.exists(os.path.join(basedir.get(), 'conflicts')):
 
 def check_conflicts():
     if os.path.exists(os.path.join(basedir.get(), 'conflicts')):