[PATCH 3 of 3 V3] rebase: prevent creating divergence

[Laurent Charignon]

Indeed, sorry for that!

Thanks,

Laurent

> On Jan 13, 2016, at 10:26 AM, Martin von Zweigbergk <martinvonz at google.com> wrote:
> 
> On Tue, Jan 12, 2016 at 1:44 PM, Laurent Charignon <lcharignon at fb.com> wrote:
>> diff --git a/mercurial/dirstate.py b/mercurial/dirstate.py
>> --- a/mercurial/dirstate.py
>> +++ b/mercurial/dirstate.py
>> @@ -141,6 +141,9 @@ class dirstate(object):
>> 
>>     @propertycache
>>     def _nonnormalset(self):
>> +        return self.nonnormalset()
>> +
>> +    def nonnormalset(self):
>>         return nonnormalentries(self._map)
>> 
>>     @propertycache
> 
> I'm assuming this ended up here by mistake. I'll drop it in flight.