Mercurial > hg
comparison mercurial/merge.py @ 20870:6500a2eebee8
merge with stable
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Tue, 01 Apr 2014 15:11:19 -0500 |
| parents | 89059c450c56 5db105f216c3 |
| children | 0b50788c160c |
comparison
equal
deleted
inserted
replaced
| 20864:9a75d2559cff | 20870:6500a2eebee8 |
|---|---|
| 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 |