Mercurial > hg > hg-git
changeset 630:3ff09f0fac7a
git_handler.py: less cryptic error message when push fails
author | anatoly techtonik <techtonik@gmail.com> |
---|---|
date | Sun, 15 Dec 2013 15:19:22 -0500 |
parents | 8f7556543304 |
children | 24b80a953f06 |
files | hggit/git_handler.py |
diffstat | 1 files changed, 3 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/hggit/git_handler.py +++ b/hggit/git_handler.py @@ -977,8 +977,9 @@ # we already have the annotated tag. pass else: - raise hgutil.Abort("%s changed on the server, please pull " - "and merge before pushing" % ref) + raise hgutil.Abort( + "branch '%s' changed on the server, " + "please pull and merge before pushing" % ref) return new_refs