Patchwork [2,of,2,V2] encode with _fm1??

login
register
mail settings
Submitter Pierre-Yves David
Date Oct. 16, 2014, 8:17 p.m.
Message ID <6492dc0fd3cd1bac60b9.1413490645@marginatus.alto.octopoid.net>
Download mbox | patch
Permalink /patch/6345/
State Not Applicable
Headers show

Comments

Pierre-Yves David - Oct. 16, 2014, 8:17 p.m.
# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@fb.com>
# Date 1413486883 25200
#      Thu Oct 16 12:14:43 2014 -0700
# Node ID 6492dc0fd3cd1bac60b97437f8412f076652c313
# Parent  da565c825429dab5f8f638f6a4c50bcebd4bed2c
encode with _fm1??
Pierre-Yves David - Oct. 16, 2014, 9:29 p.m.
On 10/16/2014 01:17 PM, Pierre-Yves David wrote:
> # HG changeset patch
> # User Pierre-Yves David <pierre-yves.david@fb.com>
> # Date 1413486883 25200
> #      Thu Oct 16 12:14:43 2014 -0700
> # Node ID 6492dc0fd3cd1bac60b97437f8412f076652c313
> # Parent  da565c825429dab5f8f638f6a4c50bcebd4bed2c
> encode with _fm1??

Grr, patchbomd from the wrong repository. sorry.

>
> diff --git a/hgext/evolve.py b/hgext/evolve.py
> --- a/hgext/evolve.py
> +++ b/hgext/evolve.py
> @@ -2704,11 +2704,11 @@ def _obsrelsethashtree(repo):
>               if p != nullid:
>                   entry += 1
>                   sha.update(p)
>           tmarkers = repo.obsstore.relevantmarkers([ctx.node()])
>           if tmarkers:
> -            bmarkers = [obsolete._fm0encodeonemarker(m) for m in tmarkers]
> +            bmarkers = [obsolete._fm1encodeonemarker(m) for m in tmarkers]
>               bmarkers.sort()
>               for m in bmarkers:
>                   entry += 1
>                   sha.update(m)
>           if entry:
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel@selenic.com
> http://selenic.com/mailman/listinfo/mercurial-devel
>

Patch

diff --git a/hgext/evolve.py b/hgext/evolve.py
--- a/hgext/evolve.py
+++ b/hgext/evolve.py
@@ -2704,11 +2704,11 @@  def _obsrelsethashtree(repo):
             if p != nullid:
                 entry += 1
                 sha.update(p)
         tmarkers = repo.obsstore.relevantmarkers([ctx.node()])
         if tmarkers:
-            bmarkers = [obsolete._fm0encodeonemarker(m) for m in tmarkers]
+            bmarkers = [obsolete._fm1encodeonemarker(m) for m in tmarkers]
             bmarkers.sort()
             for m in bmarkers:
                 entry += 1
                 sha.update(m)
         if entry: