[Bug 5726] New: per directory .hgignore

2017-10-31 Thread mercurial-bugs
https://bz.mercurial-scm.org/show_bug.cgi?id=5726 Bug ID: 5726 Summary: per directory .hgignore Product: Mercurial Version: 4.4-rc Hardware: All OS: All Status: UNCONFIRMED Severity: feature Prio

[PATCH] help: minor copy editing for grammar

2017-10-31 Thread Matt Harbison
# HG changeset patch # User Matt Harbison # Date 1509505769 14400 # Tue Oct 31 23:09:29 2017 -0400 # Branch stable # Node ID acfcc84e9e4c9ed5b33322250f0268419ffd81d2 # Parent bf2db35a6fe7a02b69eaa0e35708cf0044d73510 help: minor copy editing for grammar diff --git a/hgext/share.py b/hgext/sh

Re: [PATCH remotenames-ext] remotenames: push anonymous head if --force is given

2017-10-31 Thread Sean Farley
Pulkit Goyal <7895pul...@gmail.com> writes: > # HG changeset patch > # User Pulkit Goyal <7895pul...@gmail.com> > # Date 1507153197 -19800 > # Thu Oct 05 03:09:57 2017 +0530 > # Node ID b3cf58915bc36b7e01470f6a55dc5bd8b8f4cc9a > # Parent e7cce2b6198ace7769e2c68a5b67eddde794cfeb > remotename

[Bug 5725] New: hg fails with AttributeError: 'function' object has no attribute 'im_self'

2017-10-31 Thread mercurial-bugs
https://bz.mercurial-scm.org/show_bug.cgi?id=5725 Bug ID: 5725 Summary: hg fails with AttributeError: 'function' object has no attribute 'im_self' Product: Mercurial Version: 4.3.3 Hardware: Macintosh OS: Ma

Re: [PATCH remotenames-ext] tests: re-order tags and bookmarks in tracking test

2017-10-31 Thread Sean Farley
Martijn Pieters writes: > Review handled on Phabricator, at https://phab.mercurial-scm.org/D830 This was incorrectly pushed it seems. I'll fix it locally and re-push. I imagine Ryan messed this up due to his extensions that I assume hide non-bookmarked heads? Anyways, I've fixed it for now. s

D776: merge: add merge action 'p' to record path conflicts during update

2017-10-31 Thread mbolin (Michael Bolin)
mbolin added a comment. What test verifies this behavior? Do we need a new one? REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D776 To: mbthomas, #hg-reviewers, ryanmce Cc: mbolin, ryanmce, mercurial-devel ___ Mercurial

Re: [PATCH STABLE] configitems: relax warning about unwanted default value

2017-10-31 Thread Yuya Nishihara
On Tue, 31 Oct 2017 10:44:42 -0400, Augie Fackler wrote: > > On Oct 31, 2017, at 10:32, Yuya Nishihara wrote: > > # HG changeset patch > > # User Yuya Nishihara > > # Date 1509457050 -32400 > > # Tue Oct 31 22:37:30 2017 +0900 > > # Branch stable > > # Node ID 4f00958f5fc9d7ae90468f6159dff77

Re: [PATCH STABLE] configitems: relax warning about unwanted default value

2017-10-31 Thread Augie Fackler
> On Oct 31, 2017, at 10:32, Yuya Nishihara wrote: > > # HG changeset patch > # User Yuya Nishihara > # Date 1509457050 -32400 > # Tue Oct 31 22:37:30 2017 +0900 > # Branch stable > # Node ID 4f00958f5fc9d7ae90468f6159dff7720d0f2b27 > # Parent 5caae380ff90735b1a1841a4f26147bf0f01351b > co

[PATCH STABLE] configitems: relax warning about unwanted default value

2017-10-31 Thread Yuya Nishihara
# HG changeset patch # User Yuya Nishihara # Date 1509457050 -32400 # Tue Oct 31 22:37:30 2017 +0900 # Branch stable # Node ID 4f00958f5fc9d7ae90468f6159dff7720d0f2b27 # Parent 5caae380ff90735b1a1841a4f26147bf0f01351b configitems: relax warning about unwanted default value The original cond

D1270: help: adding a topic on flags

2017-10-31 Thread dlax (Denis Laxalde)
dlax added inline comments. INLINE COMMENTS > flags.txt:30 > +In order to set a default value for a flag in an hgrc file, set it under the > +[defaults] section of the hgrc file:: > + `hg help config` says that "defaults" are deprecated and that aliases should be used instead. REPOSITORY rHG