This change could not be recorded without itself
BD5PC25AB5MKVIYDFSDGRZ4YGX4PKW4SMZ3YAYAPNA5HLDVJUR3QC
KQTD46KVVWMJ3W6O55BEJLCVTNTDLUH6QT46AEFT7OU2SELXG4IAC
HMMMKONLCRAXVT7SO2ITTFDOJIQKKVSRIZPXYVPDC34RCBHWMHVAC
5BRU2RRWOQBMS2V3RQM7PRFR5UILYZ73GISHAKJA6KIZGC5M2MFAC
SXEYMYF7P4RZMZ46WPL4IZUTSQ2ATBWYZX7QNVMS3SGOYXYOHAGQC
BXD3IQYNMKMI5BTANCF6NZHZP4CKPWADGJMBT2R3WTMKVKONT5QAC
I52XSRUH5RVHQBFWVMAQPTUSPAJ4KNVID2RMI3UGCVKFLYUO6WZAC
VO5OQW4W2656DIYYRNZ3PO7TQ4JOKQ3GVWE5ALUTYVMX3WMXJOYQC
ZXTHL45OYLOICXTXXEQ6AMNSLMQFZ6BFUJWMO6LZOSDK7ERROC5AC
YACC5QR6WTVC3IJCCVH6GUYFU4KAPITOED43V2MDP3TVGLTL2NEQC
KDF6FJRVF72L274BEUJCTUKRFMNL6BDZMTVKDPEYGFX4TC3YOVSQC
match diff.marker.get(&diff.pos_a[i].pos) {
Some(ConflictMarker::Begin) => {
if let ConflictType::Zombie =
diff.conflict_ends[diff.pos_a[i].conflict].conflict_type
{
solved_conflict_end =
solved_conflict_end.max(diff.conflict_ends[diff.pos_a[i].conflict].end_pos)
}
}
None => delete_parents(
debug!("pos = {:?} {:?}", diff.pos_a[i].pos, diff.pos_a[i].vertex);
let marker = diff.marker.get(&diff.pos_a[i].pos);
if marker.is_none() || (!diff.pos_a[i].vertex.is_root() && diff.pos_a[i].vertex.is_empty())
{
debug!("{:?}", diff.vertex(i, pos, end_pos));
delete_parents(
),
_ => {}
)
} else if let Some(ConflictMarker::Begin) = marker {
debug!(
"conflict type = {:#?}",
diff.conflict_ends[diff.pos_a[i].conflict].conflict_type
);
if let ConflictType::Zombie = diff.conflict_ends[diff.pos_a[i].conflict].conflict_type {
solved_conflict_end =
solved_conflict_end.max(diff.conflict_ends[diff.pos_a[i].conflict].end_pos)
}
} else {
debug!("conflict: {:?}", marker);
crate::pristine::iter_adjacent(
txn,
&channel,
vertex,
EdgeFlags::PARENT | EdgeFlags::BLOCK,
EdgeFlags::PARENT | EdgeFlags::BLOCK | EdgeFlags::FOLDER,
)
.next()?;
if !is_alive(txn, &channel, vertex) {
return None;
}