Fixing a bug in replacements, recently introduced during a fix of a graph corruption bug

[?]
Jan 29, 2021, 3:07 PM
CUHXXBDZJRSAQD5USKGQACUQL4O7KYDT2T4SB3USCFO3IKMYKFDQC

Dependencies

  • [2] HR3WK6A7 When lock times out, check that there are no more clients before quitting
  • [3] HQ56ADNS Formatting, and version bump
  • [4] VYHHOEYH Versions and formatting
  • [5] WIORLB47 Version bump
  • [6] IYJZVLET Cleaning up the literate programming bits
  • [7] BZCGXVS7 Fixing two bugs around conflicts on the last line, where invalid patches were produced (first bug) and applied (second bug)
  • [8] XL6Y64UP Fixing a panic when iterating over the basenames of a file
  • [9] OCBM7IFE New release: pijul-1.0.0-alpha.8
  • [10] JACZWIJ6 Version bump
  • [11] WI5BS6BS New published versions
  • [12] 23LVKATN Use pager crate for log output
  • [13] ZTVNGFNT Version bump
  • [14] 6DOXSHWG Cleanup, and version bump
  • [15] TPEH2XNB 1.0.0-alpha.28, with Tokio 1.0
  • [16] ZQXP3HNA Version bump
  • [17] JRENVH5D Reqwest 0.11
  • [18] HKEOO4QJ Version bump
  • [19] 3WIQYEIS Fixing conflicts in Cargo.lock
  • [20] 5YDI33C4 Fixing pager on OSX
  • [21] SPA2OL5I keep-changes feature (default) to avoid deleting problematic changes
  • [22] XWETQ4DE Upgrading versions
  • [23] OUWD436A Version bump
  • [24] CCLLB7OI Upgrading to Sanakirja 0.15 + version bump
  • [25] PJ7T2VFL Do not hang on locked repositories
  • [26] YX3VCEOM Version bump
  • [27] HSVGP2G4 Version bump + formatting
  • [28] JL4WKA5P Implement the Sanakirja concurrency model in a cross-process way
  • [29] SN7AGY6S Making `pijul lock` robust to kill signals
  • [30] 5BRU2RRW Cleanup (debugging a crash related to trees/inodes)
  • [31] XAY4DYRR Version bump
  • [32] KUMJITTF Version bump in the lockfiles
  • [33] B3QWIGDE Fixing the Git features with the latest Pijul (+ conflicts in Cargo.toml)
  • [34] B5Z4IMEU Generating Cargo.nix for pijul 1.0.0-alpha.6
  • [35] BT2ZHPY4 Version bumps
  • [36] CT6FBU57 SDPX license + version bump
  • [37] SXEYMYF7 Fixing the bad changes in history (unfortunately, by rebooting).
  • [38] HW5Q7GGY Version bump
  • [39] G6YZ7U65 Version bump
  • [40] UFCZKKLX Upgrading to the latest Sanakirja/Rand
  • [41] N35L72XV Versions in Cargo.lock
  • [42] 3S4DR77Z Version updates
  • [43] NX5I5H53 New published versions
  • [44] KVBLRDOU Concatenating edits with order conflict resolutions (if relevant), and parsing the text format of the result
  • [45] SAGSYAPX Various version bumps

Change contents

  • replacement in pijul/Cargo.toml at line 4
    [4.196462][2.517:544]()
    version = "1.0.0-alpha.36"
    [4.196462]
    [4.196488]
    version = "1.0.0-alpha.38"
  • replacement in pijul/Cargo.toml at line 54
    [4.197438][4.342:432]()
    libpijul = { path = "../libpijul", version = "1.0.0-alpha.31", features = [ "tarball" ] }
    [4.197438]
    [4.197523]
    libpijul = { path = "../libpijul", version = "1.0.0-alpha.34", features = [ "tarball" ] }
  • replacement in libpijul/src/diff/replace.rs at line 72
    [4.45][4.67:93]()
    if start <= end {
    [4.45]
    [3.0]
    if start >= end {
  • replacement in libpijul/Cargo.toml at line 4
    [4.1020894][3.195:222]()
    version = "1.0.0-alpha.33"
    [4.1020894]
    [4.27]
    version = "1.0.0-alpha.34"
  • replacement in Cargo.lock at line 937
    [4.560][3.223:250]()
    version = "1.0.0-alpha.33"
    [4.560]
    [4.729]
    version = "1.0.0-alpha.34"
  • replacement in Cargo.lock at line 1289
    [4.1064071][2.619:646]()
    version = "1.0.0-alpha.36"
    [4.1064071]
    [4.1064097]
    version = "1.0.0-alpha.38"