equal
deleted
inserted
replaced
76 self._other = bin(record) |
76 self._other = bin(record) |
77 elif rtype == "F": |
77 elif rtype == "F": |
78 bits = record.split("\0") |
78 bits = record.split("\0") |
79 self._state[bits[0]] = bits[1:] |
79 self._state[bits[0]] = bits[1:] |
80 elif not rtype.islower(): |
80 elif not rtype.islower(): |
81 raise util.Abort(_('unsupported merge state record:' |
81 raise util.Abort(_('unsupported merge state record: %s') |
82 % rtype)) |
82 % rtype) |
83 self._dirty = False |
83 self._dirty = False |
84 |
84 |
85 def _readrecords(self): |
85 def _readrecords(self): |
86 """Read merge state from disk and return a list of record (TYPE, data) |
86 """Read merge state from disk and return a list of record (TYPE, data) |
87 |
87 |