Evolve 10.0.2 released

We pushed a new release for the evolve extension: 10.0.2. As usual, the release is available on PyPI and upgrade is recommended. This is a bugfix release that addresses issues in split and uncommit commands from evolve extension and revset logic in topic extension. Check the changelog for

Evolve 10.0.2 released

We pushed a new release for the evolve extension: 10.0.2. As usual, the release is available on PyPI and upgrade is recommended. This is a bugfix release that addresses issues in split and uncommit commands from evolve extension and revset logic in topic extension. Check the changelog for

mercurial@45414: 2 new changesets

2 new changesets in mercurial: https://www.mercurial-scm.org/repo/hg/rev/8ddbb75bad09 changeset: 45413:8ddbb75bad09 parent: 45411:a42999f611ff user:Augie Fackler date:Mon Sep 07 15:31:34 2020 -0400 summary: git: convert tz offset to int (issue6359)

mercurial@45412: new changeset (1 on stable)

New changeset (1 on stable) in mercurial: https://www.mercurial-scm.org/repo/hg/rev/aaeccdb6e654 changeset: 45412:aaeccdb6e654 branch: stable tag: tip parent: 45398:d58a205d0672 user:Matt Harbison date:Fri Sep 04 15:21:02 2020 -0400 summary: repoview: pin

Re: [PATCH 1 of 2] test-grep: document that trivially moved lines might not be detected

queued, thanks > On Sep 9, 2020, at 08:20, Yuya Nishihara wrote: > > # HG changeset patch > # User Yuya Nishihara > # Date 1599568690 -32400 > # Tue Sep 08 21:38:10 2020 +0900 > # Node ID cc233fb2375feef75d3f9619ed69cd5d5dea89dd > # Parent 89d2c8f8bb4f5bfda272d2665ebcacd98e273d25 >

Re: [PATCH] revset: remove indirect indexing of status tuple

queued, thanks > On Sep 9, 2020, at 08:17, Yuya Nishihara wrote: > > # HG changeset patch > # User Yuya Nishihara > # Date 1599619911 -32400 > # Wed Sep 09 11:51:51 2020 +0900 > # Node ID 89d2c8f8bb4f5bfda272d2665ebcacd98e273d25 > # Parent 0babbc33baec093b9119be36ec535edb8a12b3b8 >

D9004: hgdemandimport: bypass demandimport for _ast module (issue6407)

durin42 created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY This is broken on Python 3.9rc1, and while it sounds like there may be a fix in Python, we probably also should have this workaround in place in hg. See the

Re: Wheels on PyPI ?

On 9/8/20 1:58 PM, PIERRE AUGIER wrote: Hi, I was working on a PR to add Mercurial support to MyBinder (https://github.com/jupyterhub/repo2docker/pull/950). I need to add mercurial and hg-evolve as requirements. However, since there is no wheel updated for Linux and OSX, (i) the CI fails

D9003: merge: store cases when a file is absent post merge in commitinfo

pulkit created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY Some merges can result in file being absent form working directory. This can be one of file was kept deleted or file was removed by merge code. User might

D9002: mergestate: introduce a new ACTION_KEEP_NEW

pulkit created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY `ACTION_KEEP` is overloaded and it's hard to figure out how we end up with this KEEP, what was the state of things. In a previous patch, we introduced

[PATCH 2 of 2] grep: fix hash(linestate) to not include linenum

# HG changeset patch # User Yuya Nishihara # Date 1599619278 -32400 # Wed Sep 09 11:41:18 2020 +0900 # Node ID d9a83a225c54affd48b570c486bd4f08a6877252 # Parent cc233fb2375feef75d3f9619ed69cd5d5dea89dd grep: fix hash(linestate) to not include linenum linestate.__eq__() just compares the

[PATCH 1 of 2] test-grep: document that trivially moved lines might not be detected

# HG changeset patch # User Yuya Nishihara # Date 1599568690 -32400 # Tue Sep 08 21:38:10 2020 +0900 # Node ID cc233fb2375feef75d3f9619ed69cd5d5dea89dd # Parent 89d2c8f8bb4f5bfda272d2665ebcacd98e273d25 test-grep: document that trivially moved lines might not be detected I'm not going to

[PATCH] revset: remove indirect indexing of status tuple

# HG changeset patch # User Yuya Nishihara # Date 1599619911 -32400 # Wed Sep 09 11:51:51 2020 +0900 # Node ID 89d2c8f8bb4f5bfda272d2665ebcacd98e273d25 # Parent 0babbc33baec093b9119be36ec535edb8a12b3b8 revset: remove indirect indexing of status tuple Just use the attribute name. diff

mercurial@45411: new changeset

New changeset in mercurial: https://www.mercurial-scm.org/repo/hg/rev/a42999f611ff changeset: 45411:a42999f611ff bookmark:@ tag: tip parent: 45410:2d08dcf8fd9e parent: 45398:d58a205d0672 user:Augie Fackler date:Mon Sep 07 15:20:31 2020 -0400 summary:

Re: feature proposal: hg log -b --> hg log -t

On Tue, Sep 8, 2020 at 9:32 AM Raphaël Gomès wrote: > Whether it should be a separate flag is another question Would it be possible to override -b to accept topics? I think it would be better than a separate custom flag. -- | Raffaele Salmaso | https://salmaso.org |

Re: cherryping in a conflicting merge but not in a non conflicting one

A I see. I misunderstood what you were saying. My apologies. If I understand correctly now, you are proposing that during a merge you get to pick at each point how the merge is done, like an interactive merge. I thought you were talking about during a conflicting graft, sorry for not

Re: cherryping in a conflicting merge but not in a non conflicting one

> Uwe Brauer writes: > In what way the results of the merge not be the same in terms of the > graph? As far as I am aware, a graft doesn't connect the source commit > in the graph. The graph would look the same with what I suggested. Is > my understanding incorrect? I am