Patchwork [Bug,6097] New: "ProgrammingError: tried to relocate a node on top of itself" from evolve

login
register
mail settings
Submitter mercurial-bugs@mercurial-scm.org
Date March 7, 2019, 12:27 a.m.
Message ID <bug-6097-285@https.bz.mercurial-scm.org/>
Download mbox | patch
Permalink /patch/39115/
State Not Applicable
Headers show

Comments

mercurial-bugs@mercurial-scm.org - March 7, 2019, 12:27 a.m.
https://bz.mercurial-scm.org/show_bug.cgi?id=6097

            Bug ID: 6097
           Summary: "ProgrammingError: tried to relocate a node on top of
                    itself" from evolve
           Product: Mercurial
           Version: 4.8
          Hardware: PC
                OS: Linux
            Status: UNCONFIRMED
          Severity: bug
          Priority: wish
         Component: evolution
          Assignee: bugzilla@mercurial-scm.org
          Reporter: martinvonz@google.com
                CC: mercurial-devel@mercurial-scm.org,
                    pierre-yves.david@ens-lyon.org

This patch (applied to 8b910889) shows the bug:

Patch

diff --git a/tests/test-evolve-order.t b/tests/test-evolve-order.t
--- a/tests/test-evolve-order.t
+++ b/tests/test-evolve-order.t
@@ -16,6 +16,7 @@  evolve --rev reordering
   > [ui]
   > logtemplate = {rev}:{node|short}@{branch}({phase}) {desc|firstline}\n
   > [extensions]
+  > rebase =
   > EOF
   $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH
   $ mkcommit() {
@@ -259,3 +260,14 @@  Test multiple revision with some un-evol
   skipping 0b9488394e89: divergent rewriting. can't choose destination
   working directory is now at 31809a198477

+
+  $ hg log -G -r 34::
+  $ hg co 34
+  $ echo stuff > new-file
+  $ hg commit --amend -Aqm 'b3second and new stuff'
+  $ hg rebase -r . -d 35
+  $ hg obslog
+  $ hg prune 35
+  $ hg log -G -r 33:
+  $ hg co 34
+  $ hg evolve -aA