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

Kevin Bullock kbullock+mercurial at ringworld.org
Sat Mar 11 15:17:29 EST 2017


> On Mar 11, 2017, at 10:51, Martin von Zweigbergk via Mercurial-devel <mercurial-devel at mercurial-scm.org> wrote:
> 
> On Sat, Mar 11, 2017 at 10:45 AM, Augie Fackler <raf at durin42.com> 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!
> 
> Oh, sorry, I thought we were on Py2.7. I had noticed earlier that
> fsmonitor and watchman use set literals. I guess we just don't promise
> 2.6 compatibility for extensions?

Hmm, no, in-tree extensions ought to also work on py2.6. Seems like a bug in those extensions (probably a remnant of when they lived out-of-tree).

pacem in terris / мир / शान्ति / ‎‫سَلاَم‬ / 平和
Kevin R. Bullock



More information about the Mercurial-devel mailing list