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

2017-02-15 Thread Martin von Zweigbergk via Mercurial-devel
Nishihara ; Mercurial-devel > de...@mercurial-scm.org> >> Subject: Re: [PATCH 5 of 6] update: learn --merge to allow merging across >> topological branches (issue5125) >> >> On Wed, Feb 15, 2017 at 10:35 AM, Gábor STEFANIK >> wrote: >> >> >> &

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

2017-02-15 Thread Gábor STEFANIK
o:martinv...@google.com] > >> Sent: Wednesday, February 15, 2017 7:26 PM > >> To: Yuya Nishihara > >> Cc: Gábor STEFANIK ; Mercurial-devel > >> > >> Subject: Re: [PATCH 5 of 6] update: learn --merge to allow merging > >> across topolo

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

2017-02-15 Thread Martin von Zweigbergk via Mercurial-devel
mailto:martinv...@google.com] >>> Sent: Wednesday, February 15, 2017 7:26 PM >>> To: Yuya Nishihara >>> Cc: Gábor STEFANIK ; Mercurial-devel >>> >>> Subject: Re: [PATCH 5 of 6] update: learn --merge to allow merging across >>> topological bran

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

2017-02-15 Thread Martin von Zweigbergk via Mercurial-devel
ábor STEFANIK ; Mercurial-devel >> >> 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 wrote: >> > On Wed, 15 Feb 2017 13:29:30 +, G

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

2017-02-15 Thread Gábor STEFANIK
l policy. -Original Message- > From: Martin von Zweigbergk [mailto:martinv...@google.com] > Sent: Wednesday, February 15, 2017 7:26 PM > To: Yuya Nishihara > Cc: Gábor STEFANIK ; Mercurial-devel > > Subject: Re: [PATCH 5 of 6] update: learn --merge to allow merging across > to

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

2017-02-15 Thread Martin von Zweigbergk via Mercurial-devel
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, >> > >> + updatechec

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

2017-02-15 Thread Yuya Nishihara
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, a

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

2017-02-15 Thread Gábor STEFANIK
l policy. -Original Message- > From: Martin von Zweigbergk [mailto:martinv...@google.com] > Sent: Tuesday, February 14, 2017 11:36 PM > To: Gábor STEFANIK > Cc: Mercurial-devel > Subject: Re: [PATCH 5 of 6] update: learn --merge to allow merging across > topological branches (i

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

2017-02-15 Thread Gábor STEFANIK
l policy. -Original Message- > From: Martin von Zweigbergk [mailto:martinv...@google.com] > Sent: Tuesday, February 14, 2017 11:36 PM > To: Gábor STEFANIK > Cc: Mercurial-devel > Subject: Re: [PATCH 5 of 6] update: learn --merge to allow merging across > topological branches (i

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

2017-02-14 Thread Martin von Zweigbergk via Mercurial-devel
(+mercurial-devel) On Tue, Feb 14, 2017 at 10:48 AM, Gábor STEFANIK wrote: >> > > > -- > This message, including its attachments, is confidential. For more > information please read NNG's email policy here: > http://www.nng.