Fixing a bug when deleting conflict resolutions
[?]
May 11, 2021, 4:18 PM
352WW5FPLUBGEHM7W5WF7N7AMO56LPLL4WSR44VIPCSZVQRDLN4ACDependencies
- [2]
CCLLB7OIUpgrading to Sanakirja 0.15 + version bump - [3]
UBCBQ5FGRemoving pijul/src/commands/checkout.rs (unused file), as well as litorg comments - [4]
QNJBR73Kdon't return Result for infallible functions - [5]
SXEYMYF7Fixing the bad changes in history (unfortunately, by rebooting).
Change contents
- replacement in libpijul/src/diff/delete.rs at line 22
debug!("delete {:?}", r);debug!("delete {:?}: {:?}", r, d[r]); - replacement in libpijul/src/diff/delete.rs at line 101
let first_vertex = diff.last_vertex_containing(pos);let first_vertex = diff.first_vertex_containing(pos).max(1);debug!("first_vertex = {:?}, vertex = {:?}", first_vertex, diff.pos_a[first_vertex].vertex);