On 01/31/2017 03:49 PM, Yuya Nishihara wrote:
@@ -1029,7 +1032,19 @@ def calculateupdates(repo, wctx, mctx, a
repo.ui.warn(_(' %s: ambiguous merge - picked %s action\n') %
(f, m))
actions[f] = l[0]
+if m == 'dm':
+
# HG changeset patch
# User Mads Kiilerich
# Date 1485911430 -3600
# Wed Feb 01 02:10:30 2017 +0100
# Branch stable
# Node ID 086c37652735ca87117333fc71941bcb67b799c3
# Parent 2d6b86cadc1039f7cf72b64c29399bebe02e7dd3
merge: more safe detection of criss cross merge
On 01/31/2017 12:54 AM, Augie Fackler wrote:
# HG changeset patch
# User Augie Fackler
# Date 1485817397 18000
# Mon Jan 30 18:03:17 2017 -0500
# Branch stable
# Node ID b4118549138f0872c218835d3ae10c9e70d867de
# Parent d717001c36eb9d184b6c83874feb600adc22e8e7
tests:
https://bz.mercurial-scm.org/show_bug.cgi?id=5475
Bug ID: 5475
Summary: hg unshelve could ignore -n/--name
Product: Mercurial
Version: stable branch
Hardware: Macintosh
OS: Mac OS
Status: UNCONFIRMED
# HG changeset patch
# User Martin von Zweigbergk
# Date 1485894765 28800
# Tue Jan 31 12:32:45 2017 -0800
# Node ID bec8f8f2c0792eacb997652eb6f74b47ad8baf66
# Parent f22120b12715d7398b14c491ef89a0fa26e51533
uncommit: don't lose copy information of remaining files
Excerpts from Yuya Nishihara's message of 2017-02-01 00:48:26 +0900:
> On Tue, 31 Jan 2017 15:24:42 +, Jun Wu wrote:
> > Excerpts from Yuya Nishihara's message of 2017-01-31 23:36:46 +0900:
> > > > This introduces another race condition that unlinks an innocent socket
> > > > file.
> > > > I
6 new changesets (6 on stable) in mercurial:
https://www.mercurial-scm.org/repo/hg/rev/312b861924c8
changeset: 30853:312b861924c8
branch: stable
user:Yuya Nishihara
date:Mon Jan 30 22:50:20 2017 +0900
summary: test-highlight: add normalization rule for
https://bz.mercurial-scm.org/show_bug.cgi?id=5474
Bug ID: 5474
Summary: Version info on website is outdated
Product: Mercurial
Version: unspecified
Hardware: PC
OS: Mac OS
Status: UNCONFIRMED
Severity:
On Tue, 31 Jan 2017 15:24:42 +, Jun Wu wrote:
> Excerpts from Yuya Nishihara's message of 2017-01-31 23:36:46 +0900:
> > > This introduces another race condition that unlinks an innocent socket
> > > file.
> > > I will send a V2 later.
>
> (This actually seems to be a regression after the
Excerpts from Yuya Nishihara's message of 2017-01-31 23:36:46 +0900:
> > This introduces another race condition that unlinks an innocent socket file.
> > I will send a V2 later.
(This actually seems to be a regression after the socketserver refactoring.
It probably requires sub-classing
On Mon, 30 Jan 2017 18:54:17 -0500, Augie Fackler wrote:
> # HG changeset patch
> # User Augie Fackler
> # Date 1485817397 18000
> # Mon Jan 30 18:03:17 2017 -0500
> # Branch stable
> # Node ID b4118549138f0872c218835d3ae10c9e70d867de
> # Parent
On Tue, 31 Jan 2017 03:26:52 +0100, Mads Kiilerich wrote:
> # HG changeset patch
> # User Mads Kiilerich
> # Date 1485829559 -3600
> # Tue Jan 31 03:25:59 2017 +0100
> # Branch stable
> # Node ID 9aa0ed4d2693608c25112f0770809f5be1c8be1c
> # Parent
On Mon, 30 Jan 2017 23:31:16 -0800, Martin von Zweigbergk via Mercurial-devel
wrote:
> # HG changeset patch
> # User Martin von Zweigbergk
> # Date 1485845936 28800
> # Mon Jan 30 22:58:56 2017 -0800
> # Branch stable
> # Node ID
13 matches
Mail list logo