[PATCH 3 of 3 V2] rebase: unhide original working directory node as well (issue5219)

Yuya Nishihara yuya at tcha.org
Sat Mar 11 13:51:44 EST 2017


On Sat, 11 Mar 2017 13:45:19 -0500, Augie Fackler wrote:
> On Sat, Mar 11, 2017 at 10:22:14AM -0800, Yuya Nishihara wrote:
> > On Sat, 11 Mar 2017 09:56:17 -0800, Pierre-Yves David wrote:
> > >
> > > On 03/10/2017 11:28 PM, Martin von Zweigbergk via Mercurial-devel wrote:
> > > > # HG changeset patch
> > > > # User Martin von Zweigbergk <martinvonz at google.com>
> > > > # Date 1489216040 28800
> > > > #      Fri Mar 10 23:07:20 2017 -0800
> > > > # Node ID b8c437230731d53a6c165567a6fff1a1467f4107
> > > > # Parent  c946c7aa259ca97d5ca88238df0bb6e61d6b6313
> > > > rebase: unhide original working directory node as well (issue5219)
> > > >
> > > > By including the working directory revision at the start of rebase in
> > > > the repo._rebaseset, we make sure it's not hidden when we update back
> > > > to it at the end of the rebase.
> > > >
> > > > This feels like abusing the set a bit given its name (_rebaseset), but
> > > > I couldn't think of another name that's clearly better.
> > >
> > > That looks good to me, thanks.
> >
> > Replaced set literal with set([]) for Py2.6 and queued, thanks.
> 
> D'oh. Good eye. Mark your fixed version as obsoleting mine? Thanks!

Done. Pushed mine.


More information about the Mercurial-devel mailing list