Mercurial > hgsubversion

changeset 556:8522f8ef799e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
pushmod: make outdated parent error message more helpful
author Patrick Mezard <pmezard@gmail.com>
date Sun, 07 Feb 2010 15:56:25 +0100
parents cbd7065e6ab4
children d74bf020a61c
files hgsubversion/pushmod.py tests/test_push_command.py
diffstat 2 files changed, 6 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/hgsubversion/pushmod.py
+++ b/hgsubversion/pushmod.py
@@ -203,7 +203,9 @@ def commit(ui, repo, rev_ctx, meta, base
     except core.SubversionException, e:
         if hasattr(e, 'apr_err') and (e.apr_err == core.SVN_ERR_FS_TXN_OUT_OF_DATE
                                       or e.apr_err == core.SVN_ERR_FS_CONFLICT):
-            raise hgutil.Abort('Base text was out of date, maybe rebase?')
+            raise hgutil.Abort('Outgoing changesets parent is not at '
+                               'subversion HEAD\n'
+                               '(pull again and rebase on a newer revision)')
         else:
             raise
 
--- a/tests/test_push_command.py
+++ b/tests/test_push_command.py
@@ -475,7 +475,9 @@ class PushTests(test_util.TestBase):
             assert False, 'This should have aborted!'
         except hgutil.Abort, e:
             self.assertEqual(e.args[0],
-                             'Base text was out of date, maybe rebase?')
+                             'Outgoing changesets parent is not at subversion '
+                             'HEAD\n'
+                             '(pull again and rebase on a newer revision)')
 
 
 def suite():