Solving conflicts

Feb 29, 2024, 2:21 PM

MYB5C3FPOYHHUNHDYPDWMJ6DIMJTKG6AKZMXMJYHU3KYL3LINRBQC

Dependencies

[2] QWIYNMI5 Formatting + big-endian Sanakirja
[3] Y6TBQN7M Automatically format `pijul` crate
[4] IP4CUEBE reset: Require --force to reset unspecified unrecorded changes
[5] E3DD265T Fork to a *state*
[6] QQS7LII4 Add value hints to arguments
[7] I52XSRUH Massive cleanup, and simplification
[8] L4JXJHWX pijul/*: reorganize imports and remove extern crate
[9] I24UEJQL Various post-fire fixes
[10] PIQCNEEB Upgrading to Clap 3.0.0-alpha.5
[11] X243Z3Y5 Recording only the required metadata (can even be changed later!)
[12] SXEYMYF7 Fixing the bad changes in history (unfortunately, by rebooting).
[13] VNBLGT6G Do not output unmodified files when resetting (fix)
[14] Y7YAFMFF Fix path prefix striping on Windows.
[15] VWJ2JL63 Adding a `pijul dependents` command to list the transitive closure of the reverse dependency relation
[16] QYY37T6Y Fixing a panic with reset --dry-run and no input

edit in pijul/src/commands/reset.rs at line 6

[7.38]

[4.0]

use clap::{Parser, ValueHint};
edit in pijul/src/commands/reset.rs at line 9

[7.38]→[6.482:513](∅→∅),[7.38]→[6.482:513](∅→∅)

use clap::{Parser, ValueHint};
resolve order conflict in pijul/src/commands/reset.rs at line 9

[4.164]

[7.6353]
replacement in pijul/src/commands/fork.rs at line 1

[7.167873]→[7.2309:2334](∅→∅)

use std::path::PathBuf;

[7.167873]

[5.0]

use clap::{Parser, ValueHint};
edit in pijul/src/commands/fork.rs at line 4

[7.2367]

[7.2367]

use std::path::PathBuf;
edit in pijul/src/commands/fork.rs at line 82

[7.2334]→[6.1683:1714](∅→∅),[7.2334]→[6.1683:1714](∅→∅)

use clap::{Parser, ValueHint};
resolve order conflict in pijul/src/commands/fork.rs at line 82

[7.169036]
resurrect zombie in pijul/src/commands/dependents.rs at line 1

[7.288]→[6.1959:1990](∅→∅),[7.288]→[6.1959:1990](∅→∅),[7.288]→[6.1959:1990](∅→∅)

use clap::{Parser, ValueHint};