pijul nest
guest › [sign in] [explore]

Solving conflicts

pmeunier
Feb 22, 2023, 5:22 PM
2MLOE3FPVT4ZXC4L74VC7GV2IXATZQNFLJECDPZZ7MTSW4A6XT5QC

Dependencies

  • [2] OEKRRU6O Fix test compilation
  • [3] 4EN4MDBQ Update identity dependencies
  • [4] TI7PCK7J Update `pijul/src/main.rs` to use new identity management
  • [5] TEDGMEHF Introduce subcommand for completion-script generation.
  • [6] EEBKW7VT Keys and identities
  • [7] SXEYMYF7 Fixing the bad changes in history (unfortunately, by rebooting).
  • [8] SHSJ3Y53 Fixing more tests
  • [9] ZDK3GNDB Tag transactions (including a massive refactoring of errors)
  • [10] OFQY3GUU Formatting and versions
  • [11] QL6K2ZM3 Tags
  • [12] Q3GU26WD merge with changes from sanakirja v1.1.2
  • [13] FXEDPLRI Resurrecting tests, and type cleanup (no need for Arc<RwLock<…>> anymore)
  • [14] SNZ3OAMC use native external subcommand support instead of hand-rolled one
  • [15] RRCSHAYZ Formatting
  • [16] OKE6SXPP improve docs, feedback for pijul key
  • [17] TIPZ7UXN Started fixing the tests for parallel record/output
  • [*] QJXNUQFJ Solving conflicts

Change contents

  • edit in pijul/src/main.rs at line 128
    [6.1]→[4.15:43](∅→∅),[4.43]→[6.0:8](∅→∅),[6.57]→[6.0:8](∅→∅)
    /// Identity management
    ///
  • resurrect zombie in pijul/src/main.rs at line 133
    [6.38]→[5.0:72](∅→∅),[6.38]→[5.0:72](∅→∅)
    /// Shell completion script generation
    Completion(Completion),
  • resolve order conflict in pijul/src/main.rs at line 133
    [4.313]
    [5.0]
  • resurrect zombie in pijul/Cargo.toml at line 24
    [6.7467]→[5.1424:1448](∅→∅),[6.7467]→[5.1424:1448](∅→∅)
    clap_complete = "3.0.4"
  • resolve order conflict in pijul/Cargo.toml at line 24
    [3.13791]
    [5.1424]
  • resurrect zombie in libpijul/src/tests/mod.rs at line 99
    [6.574]→[6.941:981](∅→∅),[6.574]→[6.941:981](∅→∅),[6.981]→[6.20381:20433](∅→∅),[6.981]→[6.20381:20433](∅→∅),[6.20433]→[2.1022:1067](∅→∅),[6.20433]→[2.1022:1067](∅→∅)
    T: MutTxnT + Send + Sync + 'static,
    R: WorkingCopy + Clone + Send + Sync + 'static,
    P: ChangeStore + Clone + Send + 'static,
  • edit in Cargo.lock at line 351
    [19.3423]
    [19.3453]
    ]
    [[package]]
    name = "clap_complete"
    version = "3.2.5"
    source = "registry+https://github.com/rust-lang/crates.io-index"
    checksum = "3f7a2e0a962c45ce25afce14220bc24f9dade0a1787f185cecf96bfba7847cd8"
    dependencies = [
    "clap",
  • edit in Cargo.lock at line 1910
    [19.33633]
    [19.33633]
    "clap_complete",