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

Martin von Zweigbergk martinvonz at google.com
Wed Jan 13 12:40:43 CST 2016


On Wed, 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.

Pushed to the clowncopter with that change, and with some test case
changes (e.g. "divergent: 2 changeset" is now in plural).


More information about the Mercurial-devel mailing list