D6441: help: check if a subtopic exists and raise an error if it doesn't (issue6145)

ngoldbaum updated this revision to Diff 15268. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6441?vs=15258=15268 REVISION DETAIL https://phab.mercurial-scm.org/D6441 AFFECTED FILES mercurial/help.py CHANGE DETAILS diff --git a/mercurial/help.py

Re: D6369: templatekw: make {file_*} compare to both merge parents (issue4292)

Test failures: ``` --- /home/yuya/work/hghacks/mercurial-review/tests/test-convert-bzr-merges.t +++ /home/yuya/work/hghacks/mercurial-review/tests/test-convert-bzr-merges.t.err @@ -59,7 +59,7 @@ $ glog -R source-hg o5@source "(octopus merge fixup)" files+: [], files-: [], files:

D6369: templatekw: make {file_*} compare to both merge parents (issue4292)

yuja added a comment. Test failures: --- /home/yuya/work/hghacks/mercurial-review/tests/test-convert-bzr-merges.t +++ /home/yuya/work/hghacks/mercurial-review/tests/test-convert-bzr-merges.t.err @@ -59,7 +59,7 @@ $ glog -R source-hg o5@source "(octopus merge

D6442: help: include subtopic in error message if passed

ngoldbaum updated this revision to Diff 15269. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6442?vs=15259=15269 REVISION DETAIL https://phab.mercurial-scm.org/D6442 AFFECTED FILES mercurial/help.py tests/test-help.t CHANGE DETAILS diff --git

D6417: context: get filesadded() and filesremoved() from changeset if configured

yuja added subscribers: indygreg, yuja. yuja added a comment. I can't really comment on the storage format. I'm not keen on using extras for this kind of stuff (including copies), but that seems be okay for experiment. @indygreg Any comments? > +def decodefileindices(files,

Re: Google Summer of Code '19: Add functionality to store an unresolved merge-state

On 5/15/19 8:28 PM, Navaneeth Suresh wrote: On Wed, 15 May, 2019, 10:26 PM Pulkit Goyal, <7895pul...@gmail.com > wrote: […] This project also involves publishing the conflict changesets so that other users can also help in the resolution. This will violate the

Re: Google Summer of Code '19: Add functionality to store an unresolved merge-state

On 5/23/19 10:11 PM, Navaneeth Suresh wrote: Hello all, Thanks for the comments. I found that a commit with an unresolved state should be similar to a normal merge commit with some metadata about the files which have unresolved conflicts. This is how I thought of creating a commit with

Re: D6417: context: get filesadded() and filesremoved() from changeset if configured

I can't really comment on the storage format. I'm not keen on using extras for this kind of stuff (including copies), but that seems be okay for experiment. @indygreg Any comments? > +def decodefileindices(files, data): > +try: > +subset = [] > +for str in data.split('\0'): >

Re: [PATCH 2 of 3 STABLE] manifest: avoid corruption by dropping removed files with pure (issue5801)

On Sat, 25 May 2019 22:02:01 -0400, Yuya Nishihara wrote: On Fri, 24 May 2019 00:01:39 -0400, Matt Harbison wrote: # HG changeset patch # User Matt Harbison # Date 1558662864 14400 # Thu May 23 21:54:24 2019 -0400 # Branch stable # Node ID 4cb54e688c12790fcf3cacff2b2fb3822e9f8e8f #