Re: [PATCH 5 of 6] update: learn --merge to allow merging across topological branches (issue5125)

r STEFANIK <gabor.stefa...@nng.com> >> Cc: Yuya Nishihara <y...@tcha.org>; Mercurial-devel > de...@mercurial-scm.org> >> Subject: Re: [PATCH 5 of 6] update: learn --merge to allow merging across >> topological branches (iss

RE: [PATCH 5 of 6] update: learn --merge to allow merging across topological branches (issue5125)

-Original Message- > >> From: Martin von Zweigbergk [mailto:martinv...@google.com] > >> Sent: Wednesday, February 15, 2017 7:26 PM > >> To: Yuya Nishihara <y...@tcha.org> > >> Cc: Gábor STEFANIK <gabor.stefa...@nng.com>; Mercurial-devel > >&g

Re: [PATCH 5 of 6] update: learn --merge to allow merging across topological branches (issue5125)

>>> From: Martin von Zweigbergk [mailto:martinv...@google.com] >>> Sent: Wednesday, February 15, 2017 7:26 PM >>> To: Yuya Nishihara <y...@tcha.org> >>> Cc: Gábor STEFANIK <gabor.stefa...@nng.com>; Mercurial-devel >>> <mercurial-devel@m

Re: [PATCH 5 of 6] update: learn --merge to allow merging across topological branches (issue5125)

Nishihara <y...@tcha.org> >> Cc: Gábor STEFANIK <gabor.stefa...@nng.com>; Mercurial-devel >> <mercurial-devel@mercurial-scm.org> >> Subject: Re: [PATCH 5 of 6] update: learn --merge to allow merging across >> topological branches (issue5125) >> >> On

RE: [PATCH 5 of 6] update: learn --merge to allow merging across topological branches (issue5125)

> Subject: Re: [PATCH 5 of 6] update: learn --merge to allow merging across > topological branches (issue5125) > > On Wed, Feb 15, 2017 at 6:22 AM, Yuya Nishihara <y...@tcha.org> wrote: > > On Wed, 15 Feb 2017 13:29:30 +, Gábor STEFANIK wrote: > >> > &g

Re: [PATCH 5 of 6] update: learn --merge to allow merging across topological branches (issue5125)

On Wed, Feb 15, 2017 at 6:22 AM, Yuya Nishihara wrote: > On Wed, 15 Feb 2017 13:29:30 +, Gábor STEFANIK wrote: >> > >> -def updatetotally(ui, repo, checkout, brev, clean=False, check=False): >> > >> +def updatetotally(ui, repo, checkout, brev, clean=False, >> > >> +

Re: [PATCH 5 of 6] update: learn --merge to allow merging across topological branches (issue5125)

On Wed, 15 Feb 2017 13:29:30 +, Gábor STEFANIK wrote: > > >> -def updatetotally(ui, repo, checkout, brev, clean=False, check=False): > > >> +def updatetotally(ui, repo, checkout, brev, clean=False, > > >> + updatecheck='linear'): > > > > > > Please make this updatecheck=None,

RE: [PATCH 5 of 6] update: learn --merge to allow merging across topological branches (issue5125)

Original Message- > >> From: Mercurial-devel > >> [mailto:mercurial-devel-boun...@mercurial-scm.org] > >> On Behalf Of Martin von Zweigbergk via Mercurial-devel > >> Sent: Tuesday, February 14, 2017 2:07 AM > >> To: mercurial-devel@mercurial-sc

Re: [PATCH 5 of 6] update: learn --merge to allow merging across topological branches (issue5125)

ergk via Mercurial-devel >> Sent: Tuesday, February 14, 2017 2:07 AM >> To: mercurial-devel@mercurial-scm.org >> Subject: [PATCH 5 of 6] update: learn --merge to allow merging across >> topological branches (issue5125) >> >> # HG changeset patch >> # User Mar

[PATCH 5 of 6] update: learn --merge to allow merging across topological branches (issue5125)

# HG changeset patch # User Martin von Zweigbergk # Date 1487019517 28800 # Mon Feb 13 12:58:37 2017 -0800 # Node ID 75e5a492d7f69420a554fe498ae24060c755b09f # Parent 59e2d3da607cc09ebe133ab199fc4f343d74e1e6 update: learn --merge to allow merging across topological