[PATCH 07 of 17] rebase: instead of using > nullmerge, use the more meaningful >= nullrev

[Pierre-Yves David]

On 11/30/2014 11:08 AM, Mads Kiilerich wrote:
> # HG changeset patch
> # User Mads Kiilerich <madski at unity3d.com>
> # Date 1417374421 -3600
> #      Sun Nov 30 20:07:01 2014 +0100
> # Node ID 848717d552179b3679951aefc0b28235784471ba
> # Parent  09fe6c1db24cc0c3fd3dceae4063c0a8dcbd11a5
> rebase: instead of using > nullmerge, use the more meaningful >= nullrev
>
> nullmerge is just a 'random' constant. It is more essential that nullrev comes
> just before the 'real' revision numbers and that the other constants are
> smaller.

Why not. I'm fairly sure you have a second motive behind this change. 
Can you state it?

>
> diff --git a/hgext/rebase.py b/hgext/rebase.py
> --- a/hgext/rebase.py
> +++ b/hgext/rebase.py
> @@ -26,8 +26,8 @@ import os, errno
>   # state values:
>   # >= 0 means already rebased to this rev
>   # nullrev = -1 means 'todo'
> -nullmerge = -2
> -revignored = -3
> +nullmerge = -2 # revision is ignored when rebasing, use target
> +revignored = -3 # revision is ignored when rebasing, use nearest ancestor

Can you get this doc in a different patch ?


-- 
Pierre-Yves David