[Bug 5776] New: Disabled path conflict checking for unknown files behavior is different from before the feature was added

https://bz.mercurial-scm.org/show_bug.cgi?id=5776 Bug ID: 5776 Summary: Disabled path conflict checking for unknown files behavior is different from before the feature was added Product: Mercurial Version: stable

Re: [PATCH 5 of 5 RFC] lfs: control tracked file selection via a tracked file

On Sat, 20 Jan 2018 03:01:51 -0500, Jun Wu wrote: Excerpts from Matt Harbison's message of 2018-01-14 23:58:52 -0500: [...] Jun previously expressed concern about efficiency when scaling to large repos, so I tried avoiding 'repo[None]'. (localrepo.commit() gets repo[None] already, Is r

[PATCH 2 of 3 STABLE] lfs: rename {oid} to {lfsoid}

# HG changeset patch # User Matt Harbison # Date 1516758602 18000 # Tue Jan 23 20:50:02 2018 -0500 # Branch stable # Node ID 882ea5de2df75eb058e8c8fa583e59ef61739b3c # Parent c12195501c406b30a15c796b4b728303cd189575 lfs: rename {oid} to {lfsoid} Per Yuya, for consistency with {lfspointer}.

[PATCH 1 of 3 STABLE] lfs: rename {pointer} to {lfspointer}

# HG changeset patch # User Matt Harbison # Date 1516661260 18000 # Mon Jan 22 17:47:40 2018 -0500 # Branch stable # Node ID c12195501c406b30a15c796b4b728303cd189575 # Parent de23345e2b6b880880896e27e5e2f745efa3799b lfs: rename {pointer} to {lfspointer} Per Martin von Zweigbergk's suggestio

[PATCH 3 of 3 STABLE] lfs: don't automatically exclude '.hg*' files from external tracking

# HG changeset patch # User Matt Harbison # Date 1516760985 18000 # Tue Jan 23 21:29:45 2018 -0500 # Branch stable # Node ID 414e4d9ed8518df0b69f3db69054d674cf616559 # Parent 882ea5de2df75eb058e8c8fa583e59ef61739b3c lfs: don't automatically exclude '.hg*' files from external tracking The on

Re: [PATCH 1 of 3] lfs: always exclude '.hg*' text files

On Tue, 23 Jan 2018 12:50:22 -0500, Jun Wu wrote: Excerpts from Yuya Nishihara's message of 2018-01-23 21:07:47 +0900: My original question was whether it makes sense to forcibly exclude .hg* files (e.g. .hgtags) from lfs. That seems totally fine, but fewer "if"s might be better on the other h

Re: [PATCH 1 of 3] lfs: always exclude '.hg*' text files

Excerpts from Yuya Nishihara's message of 2018-01-23 21:07:47 +0900: > My original question was whether it makes sense to forcibly exclude .hg* > files (e.g. .hgtags) from lfs. That seems totally fine, but fewer "if"s > might be better on the other hand. I see. In theory .hgtags do not need to be

[PATCH STABLE] help: do not suggest "update --clean ." to cancel uncommitted merge

# HG changeset patch # User Yuya Nishihara # Date 1516709676 -32400 # Tue Jan 23 21:14:36 2018 +0900 # Branch stable # Node ID 4e1c8beb9b7abf6b9addc64a59da186a8b3857d2 # Parent de23345e2b6b880880896e27e5e2f745efa3799b help: do not suggest "update --clean ." to cancel uncommitted merge Follo

Re: [PATCH STABLE] subrepo: handle 'C:' style paths on the command line (issue5770)

On Tue, 23 Jan 2018 20:57:54 +0900, Yuya Nishihara wrote: > > > $ mkdir '$foo' > > > $ cd '$foo' > > > $ hg init > > > $ foo=bar hg root > > > abort: repository $TESTTMP/$foo not found! > > > > Yikes. I'm assuming the expandpath() is in there to handle `hg init > > ~\myrepo` on Window

Re: [PATCH STABLE] subrepo: handle 'C:' style paths on the command line (issue5770)

On Mon, 22 Jan 2018 20:33:21 -0500, Matt Harbison wrote: > On Mon, 22 Jan 2018 07:38:39 -0500, Yuya Nishihara wrote: > > On Sun, 21 Jan 2018 15:50:33 -0500, Matt Harbison wrote: > >> Rather than fixing every command call site, just convert it in the > >> common > >> subrepo location. I don't se

Re: [PATCH 1 of 3] lfs: always exclude '.hg*' text files

On Mon, 22 Jan 2018 15:12:57 -0500, Augie Fackler wrote: > > On Jan 20, 2018, at 02:43, Jun Wu wrote: > > Excerpts from Yuya Nishihara's message of 2018-01-15 21:56:49 +0900: > >> Seems fine. Queued, thanks. > >> > >> CC-ed Jun since I'm not pretty sure if this is considered a nice feature. > >