[PATCH 3 of 3] rebase: shift all states constant by one

Pierre-Yves David pierre-yves.david at ens-lyon.org
Tue Dec 2 14:32:24 CST 2014


# HG changeset patch
# User Pierre-Yves David <pierre-yves.david at fb.com>
# Date 1417551939 28800
#      Tue Dec 02 12:25:39 2014 -0800
# Node ID 4dbdc7f27f3a78ae719d5f9826c6245c4b48734e
# Parent  627b344d81f64444216dc0ac7cfc33d63d7fcdff
rebase: shift all states constant by one

This make 'revtoto' not overlapping with nullrev anymore. As a side effect it
a rebase started with 3.2 and resumed with 3.3 will get confused. So I'm not
sure this change a is good idea. The fact is pass tests "proves" all relevant place
are using the right variable.

diff --git a/hgext/rebase.py b/hgext/rebase.py
--- a/hgext/rebase.py
+++ b/hgext/rebase.py
@@ -21,13 +21,13 @@ from mercurial.commands import templateo
 from mercurial.node import nullrev
 from mercurial.lock import release
 from mercurial.i18n import _
 import os, errno
 
-revtodo = -1
-nullmerge = -2
-revignored = -3
+revtodo = -2
+nullmerge = -3
+revignored = -4
 
 cmdtable = {}
 command = cmdutil.command(cmdtable)
 testedwith = 'internal'
 


More information about the Mercurial-devel mailing list