Mercurial > evolve

diff hgext/obsolete.py @ 302:d68ccae92d52

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
obsolete: make collapse create less markers Collapsing A and B into C was registering: A -> C B -> C A -> B At this point, the last relation brings nothing and is removed for the sake of simplicity: A -> C B -> C test-evolve.t is slightly modified as one of the relations let stabilize compute a target outside of the parent revision tree. This is a stabilize bug, not trivial to fix, so let's tweak the test for now.
author Patrick Mezard <patrick@mezard.eu>
date Sat, 23 Jun 2012 11:14:09 +0200
parents b41ff69388a8
children 7c68899b521e
line wrap: on
line diff
--- a/hgext/obsolete.py	Fri Jun 22 19:32:18 2012 +0200
+++ b/hgext/obsolete.py	Sat Jun 23 11:14:09 2012 +0200
@@ -844,8 +844,6 @@
             assert len(rootrevs) == 1, rootrevs
             rootnode = self[rootrevs[0]].node()
             for n in oldnodes:
-                if n != rootnode:
-                    self.addobsolete(n, rootnode)
                 self.addobsolete(newnode, n)
 
         def _turn_extinct_secret(self):