(
&mut self,
id: usize,
changes: Option<&[Hash]>,
)
| 414 | } |
| 415 | |
| 416 | fn begin_conflict( |
| 417 | &mut self, |
| 418 | id: usize, |
| 419 | changes: Option<&[Hash]>, |
| 420 | ) -> Result<(), std::io::Error> { |
| 421 | let hash = changes.and_then(|c| c.first()); |
| 422 | self.record_conflict(FileConflictType::Order, id as u32, hash); |
| 423 | self.write_marker(markers::START, id as u32, hash) |
| 424 | } |
| 425 | |
| 426 | fn begin_zombie_conflict( |
| 427 | &mut self, |