X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/blobdiff_plain/64354a2d7d5f11f2592f72b74b48d750cf00c6f7..4d0ba818236453fae51c9efb64950f23557cc428:/stgit/commands/common.py diff --git a/stgit/commands/common.py b/stgit/commands/common.py index bf8481e..1ea6025 100644 --- a/stgit/commands/common.py +++ b/stgit/commands/common.py @@ -113,10 +113,10 @@ def check_local_changes(): 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. If you know what you\n' \ - ' are doing, use the "refresh -f" command' + 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') def check_conflicts(): if os.path.exists(os.path.join(basedir.get(), 'conflicts')):