Mercurial > hg
comparison mercurial/merge.py @ 20867:539d9f839197 stable
merge: fix lack of "%s" in format string causing TypeError at runtime
| author | FUJIWARA Katsunori <foozy@lares.dti.ne.jp> |
|---|---|
| date | Tue, 01 Apr 2014 02:46:03 +0900 |
| parents | b96cb15ec9e0 |
| children | 5db105f216c3 |
comparison
equal
deleted
inserted
replaced
| 20866:93f573d1bfb9 | 20867:539d9f839197 |
|---|---|
| 68 self._other = bin(record) | 68 self._other = bin(record) |
| 69 elif rtype == "F": | 69 elif rtype == "F": |
| 70 bits = record.split("\0") | 70 bits = record.split("\0") |
| 71 self._state[bits[0]] = bits[1:] | 71 self._state[bits[0]] = bits[1:] |
| 72 elif not rtype.islower(): | 72 elif not rtype.islower(): |
| 73 raise util.Abort(_('unsupported merge state record:' | 73 raise util.Abort(_('unsupported merge state record: %s' |
| 74 % rtype)) | 74 % rtype)) |
| 75 self._dirty = False | 75 self._dirty = False |
| 76 def _readrecords(self): | 76 def _readrecords(self): |
| 77 v1records = self._readrecordsv1() | 77 v1records = self._readrecordsv1() |
| 78 v2records = self._readrecordsv2() | 78 v2records = self._readrecordsv2() |