Mercurial > public > mercurial-scm > evolve

diff hgext/evolve.py @ 1428:20a3b0b27bfe

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
evolve: raise MultipleSuccessorsError when computing dependency for split commits We don't know how to handle dependency for split commits yet. When facing a splitted commit, instead of silently adding the first successor to the dependency list and fail later, we do nothing.
author Laurent Charignon <lcharignon@fb.com>
date Mon, 22 Jun 2015 12:44:21 -0700
parents fcc467ca740e
children afe46c3b15db
line wrap: on
line diff
--- a/hgext/evolve.py	Tue Jun 23 15:26:51 2015 -0700
+++ b/hgext/evolve.py	Mon Jun 22 12:44:21 2015 -0700
@@ -1370,7 +1370,7 @@
                  obs)
         obs = obs.parents()[0]
         newer = obsolete.successorssets(repo, obs.node())
-    if len(newer) > 1:
+    if len(newer) > 1 or len(newer[0]) > 1:
         raise MultipleSuccessorsError(newer)
 
     return repo[newer[0][0]].rev()