Mercurial > public > mercurial-scm > hg

diff mercurial/commands.py @ 22207:8dda6f6ff564

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
author Matt Mackall <mpm@selenic.com>
date Fri, 15 Aug 2014 11:48:05 -0500
parents 269688a398c4 328efb5ca0b4
children 9be81b86ca97
line wrap: on
line diff
--- a/mercurial/commands.py	Fri Aug 15 23:05:53 2014 +0900
+++ b/mercurial/commands.py	Fri Aug 15 11:48:05 2014 -0500
@@ -2339,9 +2339,12 @@
         try:
             tr = repo.transaction('debugobsolete')
             try:
-                repo.obsstore.create(tr, parsenodeid(precursor), succs,
-                                     opts['flags'], metadata)
-                tr.close()
+                try:
+                    repo.obsstore.create(tr, parsenodeid(precursor), succs,
+                                         opts['flags'], metadata)
+                    tr.close()
+                except ValueError, exc:
+                    raise util.Abort(_('bad obsmarker input: %s') % exc)
             finally:
                 tr.release()
         finally: