Mercurial > hg

diff mercurial/obsolete.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 b27c3beaaf30 a56038e6a3c9
children 525cde5d954d
line wrap: on
line diff
--- a/mercurial/obsolete.py	Fri Aug 15 23:05:53 2014 +0900
+++ b/mercurial/obsolete.py	Fri Aug 15 11:48:05 2014 -0500
@@ -277,6 +277,8 @@
         for succ in succs:
             if len(succ) != 20:
                 raise ValueError(succ)
+        if prec in succs:
+            raise ValueError(_('in-marker cycle with %s') % node.hex(prec))
         marker = (str(prec), tuple(succs), int(flag), encodemeta(metadata))
         return bool(self.add(transaction, [marker]))