Mercurial Repositories > eric / file comparison
comparison: eric6/HexEdit/HexEditUndoStack.py
eric6/HexEdit/HexEditUndoStack.py
- changeset 8222
- 5994b80b8760
- parent 8218
- 7c09585bd960
- child 8265
- 0090cfa83159
equal
deleted
inserted
replaced
| 8221:0572a215bd2f | 8222:5994b80b8760 |
|---|---|
| 87 @return flag indicating a successful merge | 87 @return flag indicating a successful merge |
| 88 @rtype bool | 88 @rtype bool |
| 89 """ | 89 """ |
| 90 result = False | 90 result = False |
| 91 | 91 |
| 92 if self._cmd != HexEditCommand.RemoveAt: | 92 if ( |
| 93 if command._cmd == HexEditCommand.Overwrite: | 93 self._cmd != HexEditCommand.RemoveAt and |
| 94 if command._pos == self._pos: | 94 command._cmd == HexEditCommand.Overwrite and |
| 95 self._newByte = command._newByte | 95 command._pos == self._pos |
| 96 result = True | 96 ): |
| 97 self._newByte = command._newByte | |
| 98 result = True | |
| 97 | 99 |
| 98 return result | 100 return result |
| 99 | 101 |
| 100 def id(self): | 102 def id(self): |
| 101 """ | 103 """ |
