When pulling, treating the pending change as a local change
[?]
Nov 29, 2020, 12:03 PM
7L32EXDWOT2BWHPC3ZPAE4W6BOGQTTJUYJWTNMLS6INFXZ7GLPNQCDependencies
- [2]
SXEYMYF7Fixing the bad changes in history (unfortunately, by rebooting). - [3]
M5FK3ABTComplete dependencies when pushing and pulling - [4]
Q45QHPO4Feedback on network stuff
Change contents
- replacement in pijul/src/commands/pushpull.rs at line 368
Some(txn.apply_recorded(&mut channel, recorded, &repo.changes)?)let actions = recorded.actions.into_iter().map(|rec| rec.globalize(&txn)).collect();let mut pending_change = libpijul::change::Change::make_change(&txn,&channel,actions,recorded.contents,libpijul::change::ChangeHeader::default(),Vec::new(),);let (dependencies, extra_known) =libpijul::change::dependencies(&txn, &channel, pending_change.changes.iter());pending_change.dependencies = dependencies;pending_change.extra_known = extra_known;let hash = repo.changes.save_change(&pending_change).unwrap();txn.apply_local_change(&mut channel, &pending_change, hash, &recorded.updatables)?;Some(hash)