D9082: chg: make clang format happy

marmoute created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY The format breakage was introduced in eb443f7cbc2c . REPOSITORY rHG Mercurial

mercurial@45525: 2 new changesets

2 new changesets in mercurial: https://www.mercurial-scm.org/repo/hg/rev/6877b0ee5f9d changeset: 45524:6877b0ee5f9d parent: 45521:e7587430ca23 user:Pulkit Goyal <7895pul...@gmail.com> date:Wed Sep 09 16:49:19 2020 +0530 summary: mergestate: introduce a new

Re: [PATCH 6 of 9] merge: store commitinfo if mergetool resolved a dc or cd conflict

On 9/24/20 2:56 PM, Yuya Nishihara wrote: On Wed, 23 Sep 2020 13:48:21 +0530, Pulkit Goyal wrote: # HG changeset patch # User Pulkit Goyal <7895pul...@gmail.com> # Date 1599120846 -19800 # Thu Sep 03 13:44:06 2020 +0530 # Node ID 30332428d8b0233053742be0c27bcb3e6499ed15 # Parent

D9081: git: add test showing `hg commit -i` working on a git repo

sheehan created this revision. Herald added a reviewer: durin42. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY Shows `hg commit -i` working on a git repo via the `git` extension. Adds working directory changes to files `alpha` and

Re: Virtual sprint? Ideas?

Pierre-Yves said on chat that we usually try to do the sprint right after a release. That would mean the week of November 2. Sounds good? On Wed, Sep 23, 2020 at 9:04 PM Martin von Zweigbergk wrote: > I created a wiki page for the sprint: > https://www.mercurial-scm.org/wiki/5.6Sprint. It's

D9079: rust-tests: add test to check if `Cargo.lock` is up-to-date

Alphare created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY An out-of-date `Cargo.lock` is the source of rebase conflicts, prevents a reproductible build, introduces desync between the series that introduces a change

D9080: rust: update Cargo.lock

Alphare created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D9080 AFFECTED FILES rust/Cargo.lock CHANGE DETAILS diff --git a/rust/Cargo.lock

mercurial@45523: 2 new changesets (2 on stable)

2 new changesets (2 on stable) in mercurial: https://www.mercurial-scm.org/repo/hg/rev/5a555d6e0d90 changeset: 45522:5a555d6e0d90 branch: stable parent: 45509:2bc978921e8a user:Martin von Zweigbergk date:Wed Sep 23 16:07:14 2020 -0700 summary: tests: demonstrate

Re: [PATCH 6 of 9] merge: store commitinfo if mergetool resolved a dc or cd conflict

On Wed, 23 Sep 2020 13:48:21 +0530, Pulkit Goyal wrote: > # HG changeset patch > # User Pulkit Goyal <7895pul...@gmail.com> > # Date 1599120846 -19800 > # Thu Sep 03 13:44:06 2020 +0530 > # Node ID 30332428d8b0233053742be0c27bcb3e6499ed15 > # Parent 62404f1a66ec45ca819d411746138894dcab6e91 >

Re: [PATCH 2 of 9] configitems: add a new config option to control new filenode functionality

On Wed, 23 Sep 2020 13:48:17 +0530, Pulkit Goyal wrote: > # HG changeset patch > # User Pulkit Goyal <7895pul...@gmail.com> > # Date 1600074083 -19800 > # Mon Sep 14 14:31:23 2020 +0530 > # Node ID 2f20d3b618ac474fd9341b86fa4f8e5791b66290 > # Parent 172ab535796f7cc34ef113a73aa95eb50aaf3f31 >

Re: [PATCH 1 of 9] scmutil: introduce function to check whether repo uses treemanifest or not

On Wed, 23 Sep 2020 13:48:16 +0530, Pulkit Goyal wrote: > # HG changeset patch > # User Pulkit Goyal <7895pul...@gmail.com> > # Date 1598963904 -19800 > # Tue Sep 01 18:08:24 2020 +0530 > # Node ID 172ab535796f7cc34ef113a73aa95eb50aaf3f31 > # Parent 93c43a480bf0851999abcb99914f3c23846f34c1 >