don't return Result for infallible functions
[?]
Dec 5, 2020, 4:39 PM
QNJBR73KCSCCF6FTHGZDF2K7PZQL3EFKZFOBT77KYZBMALTTW6OQCDependencies
- [2]
I52XSRUHMassive cleanup, and simplification - [3]
KVBLRDOUConcatenating edits with order conflict resolutions (if relevant), and parsing the text format of the result - [4]
UBCBQ5FGRemoving pijul/src/commands/checkout.rs (unused file), as well as litorg comments - [5]
WZVCLZKYaddress clippy lints - [6]
74HX2XZDCleanup and debugging - [7]
SXEYMYF7Fixing the bad changes in history (unfortunately, by rebooting). - [8]
ZXTHL45Oaddress clippy lints - [9]
7A2TSC4PConflict solving code (FOLDER edges)
Change contents
- replacement in libpijul/src/pristine/mod.rs at line 325
Ok(Position {change: if let Some(p) = pos.change {if let Some(p) = txn.get_internal(p) {p} else {return Err(crate::Error::InconsistentChange);}let change = if let Some(p) = pos.change {if let Some(p) = txn.get_internal(p) {p - replacement in libpijul/src/pristine/mod.rs at line 329
change_id},return Err(crate::Error::InconsistentChange);}} else {change_id};Ok(Position {change, - replacement in libpijul/src/diff/replace.rs at line 37
) -> Result<(), anyhow::Error> {) { - replacement in libpijul/src/diff/replace.rs at line 80
return Ok(());return; - edit in libpijul/src/diff/replace.rs at line 96
Ok(()) - replacement in libpijul/src/diff/mod.rs at line 111
)?); - replacement in libpijul/src/diff/mod.rs at line 114
self.replace(&d, &mut conflict_contexts, &lines_a, &lines_b, &dd, r)?self.replace(&d, &mut conflict_contexts, &lines_a, &lines_b, &dd, r); - replacement in libpijul/src/diff/delete.rs at line 21
) -> Result<(), anyhow::Error> {) { - edit in libpijul/src/diff/delete.rs at line 37
Ok(())