Fixing conflicts

[?]

Mar 2, 2021, 7:49 PM

XSEODPNEN2Y2THBRO7L5QFPAEQVSQTLAFZFWCRMBGZ3YSRZB2UJAC

Dependencies

[2] YTQS4ES3 Fixing a parsing problem (related to permissions), and the associated permissions
[3] EAZ45JTF Fixing a bug in change printing
[4] Q3GU26WD merge with changes from sanakirja v1.1.2
[5] LCXEUK7K separate line endings test data for dos and unix
[6] SXEYMYF7 Fixing the bad changes in history (unfortunately, by rebooting).
[7] CIEUBH46 Fixing an index-out-of-bounds error when serialising bad changes
[8] XWETQ4DE Upgrading versions
[9] 6DOXSHWG Cleanup, and version bump
[10] NO2QPRFL Adding rollback test
[11] JRENVH5D Reqwest 0.11
[12] CCFJ7VO3 Renaming "Record" to "Hunk" in the changes
[13] KJDQ2WOM Fixing the parsing of section headers in the text change format
[14] YN63NUZO Sanakirja 1.0
[15] WEHUTJUK Lockfile update
[16] X243Z3Y5 Recording only the required metadata (can even be changed later!)
[17] QQZNSB26 Permission update (after #X243)
[18] NYOF5766 track file encoding in the record, including change text for file adds
[19] VO5OQW4W Removing anyhow in libpijul
[20] 6HNRL5RT detect non-utf8 text files
[21] 33SQMZYX New versions of dependencies
[22] H62VFFJE Cargo.nix, and solving conflicts
[23] UM5DLRPB store new non-UTF-8 files raw and decode to deplay the contents
[24] 3WIQYEIS Fixing conflicts in Cargo.lock
[25] LYTVEPH3 Avoid cloning into an existing path
[26] HDGRZISM Version updates

Change contents

file move: text.rs (-xw-x--x--)text.rs (-xw-x--x--)text.rs (-xwrx-rx-r) → text.rs (----------)

[6.248792]

[6.10]
file move: data (dxwrx-rx-r) → data (d--r------)

[6.248792]

[6.4375]
file move: gb.2 (-xw-x--x--) → gb.2 (----------)

[6.4375]

[6.4383]
file move: gb.1 (-xw-x--x--) → gb.1 (----------)

[6.4375]

[6.4448]
file move: 8859-1.2 (-xw-x--x--) → 8859-1.2 (----------)

[6.4375]

[6.4517]
file move: 8859-1.1 (-xw-x--x--) → 8859-1.1 (----------)

[6.4375]

[6.4590]
file move: 1252.2 (-xw-x--x--) → 1252.2 (----------)

[6.4375]

[6.4661]
file move: 1252.1 (-xw-x--x--) → 1252.1 (----------)

[6.4375]

[6.4725]
file move: 1252-dos.2 (-xw-x--x--) → 1252-dos.2 (----------)

[6.4375]

[5.117]
file move: 1252-dos.1 (-xw-x--x--) → 1252-dos.1 (----------)

[6.4375]

[5.185]
resolve name conflict: mod.rs (-xw-x--x--)mod.rs (-xwrx-rx-r)mod.rs (-xw-x--x--)

[6.768883]→[6.376:384](∅→∅),[6.768883]→[6.2937:2945](∅→∅),[6.768883]→[6.793238:793246](∅→∅)
replacement in libpijul/src/change/text_changes.rs at line 434

[6.52618]→[6.1945:2008](∅→∅)

"File addition: {:?} in {:?}{}\n up",

[6.52618]

[6.2008]

"File addition: {:?} in {:?}{} {:?}\n up",
replacement in libpijul/src/change/text_changes.rs at line 443

[6.2320]→[6.2320:2346](∅→∅),[6.52618]→[6.3390:3523](∅→∅)

}
"File addition: {:?} in {:?} {:o} {:?}\n up",
name, parent, perms.0, encoding_label

[6.2320]

[6.52730]

},
encoding_label
replacement in libpijul/src/change/text_changes.rs at line 553

[6.57069]→[2.156:286](∅→∅),[6.57069]→[6.3524:3673](∅→∅)

Regex::new(r#"^(?P<n>\d+)\. File addition: "(?P<name>[^"]*)" in "(?P<parent>[^"]*)"(?P<perm> [^ ]+)?"#).unwrap();
Regex::new(r#"^(?P<n>\d+)\. File addition: "(?P<name>[^"]*)" in "(?P<parent>[^"]*)" (?P<perm>\d+) "(?P<encoding>[^"]*)""#).unwrap();

[6.57069]

[6.57195]

Regex::new(r#"^(?P<n>\d+)\. File addition: "(?P<name>[^"]*)" in "(?P<parent>[^"]*)"(?P<perm> [^ ]+)? "(?P<encoding>[^"]*)"#).unwrap();
resurrect zombie in "libpijul/src/change/text_changes.rs" at line 1295

[6.86184]→[3.0:95](∅→∅),[6.86184]→[3.0:95](∅→∅)

if !buf.ends_with(b"\n") {
writeln!(w)?;
}
edit in libpijul/src/change/text_changes.rs at line 1295

[6.86133]

[3.0]

print_contents(w, "-", &buf[..], &None)?;
edit in libpijul/src/change/text_changes.rs at line 1299

[6.86133]→[6.640:698](∅→∅)

print_contents(w, "-", &buf[..], &None)?;
edit in Cargo.lock at line 105

[6.1033914]

[6.1033914]

name = "bitvec"
version = "0.19.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a7ba35e9565969edb811639dbebfe34edc0368e472c5018474c8eb2543397f81"
dependencies = [
"funty",
"radium",
"tap",
"wyz",
]

[[package]]
edit in Cargo.lock at line 526

[6.1044436]

[6.1044891]

name = "funty"
version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fed34cd105917e91daa4da6b3728c47b068749d6a62c59811f06ed2ac71d9da7"

[[package]]
replacement in Cargo.lock at line 915

[6.6432]→[6.6432:6450](∅→∅)

version = "0.7.4"

[6.6432]

[6.6450]

version = "0.7.5"
replacement in Cargo.lock at line 917

[6.6515]→[6.6515:6593](∅→∅)

checksum = "db65c6da02e61f55dae90a0ae427b2a5f6b3e8db09f58d10efab23af92592616"

[6.6515]

[6.6593]

checksum = "21f866863575d0e1d654fbeeabdc927292fdf862873dc3c96c6f753357e13374"
replacement in Cargo.lock at line 921

[6.6636]→[6.6636:6654](∅→∅)

"cfg-if 0.1.10",

[6.6636]

[6.6654]

"cfg-if 1.0.0",
replacement in Cargo.lock at line 928

[6.1054747]→[6.154560:154579](∅→∅)

version = "0.2.86"

[6.1054747]

[6.1054766]

version = "0.2.87"
replacement in Cargo.lock at line 930

[6.1054831]→[6.154580:154658](∅→∅)

checksum = "b7282d924be3275cec7f6756ff4121987bc6481325397dde6ba3e7802b1a8b1c"

[6.1054831]

[6.1054909]

checksum = "265d751d31d6780a3f956bb5b8022feba2d94eeee5a84ba64f4212eedca42213"
replacement in Cargo.lock at line 1146

[6.6768]→[6.6768:6786](∅→∅)

version = "5.1.2"

[6.6768]

[6.6786]

version = "6.1.2"
replacement in Cargo.lock at line 1148

[6.6851]→[6.6851:6929](∅→∅)

checksum = "ffb4262d26ed83a1c0a33a38fe2bb15797329c85770da05e6b828ddb782627af"

[6.6851]

[6.6929]

checksum = "e7413f999671bd4745a7b624bd370a569fb6bc574b23c83a3c5ed2e453f3d5e2"
edit in Cargo.lock at line 1150

[6.6946]

[6.6946]

"bitvec",
"funty",
replacement in Cargo.lock at line 1214

[6.1061717]→[6.155548:155566](∅→∅)

version = "1.7.0"

[6.1061717]

[6.1061735]

version = "1.7.2"
replacement in Cargo.lock at line 1216

[6.1061800]→[6.155567:155645](∅→∅)

checksum = "10acf907b94fc1b1a152d08ef97e7759650268cf986bf127f387e602b02c7e5a"

[6.1061800]

[6.1061878]

checksum = "af8b08b04175473088b46763e51ee54da5f9a164bc162f615b91bc179dbf15a3"
replacement in Cargo.lock at line 1394

[6.1065701]→[6.2135:2153](∅→∅)

version = "0.2.4"

[6.1065701]

[6.1392]

version = "0.2.5"
replacement in Cargo.lock at line 1396

[6.1457]→[6.2154:2232](∅→∅)

checksum = "439697af366c49a6d0a010c56a0d97685bc140ce0d377b13a2ea2aa42d64a827"

[6.1457]

[6.1535]

checksum = "0cf491442e4b033ed1c722cb9f0df5fcfcf4de682466c46469c36bc47dc5548a"
edit in Cargo.lock at line 1471

[6.1068075]

[6.1068075]

name = "radium"
version = "0.5.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "941ba9d78d8e2f7ce474c015eea4d9c6d25b6a3327f9832ee29a4de27f91bbb8"

[[package]]
edit in Cargo.lock at line 1834

[6.1076034]

[6.1076034]

name = "tap"
version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"

[[package]]
resurrect zombie in "Cargo.lock" at line 2112

[6.1082329]→[6.7436:7476](∅→∅),[6.1082329]→[6.7436:7476](∅→∅)

]

[[package]]
name = "tree_magic_mini"
replacement in Cargo.lock at line 2116

[6.7476]→[6.7476:7494](∅→∅),[6.7476]→[6.7476:7494](∅→∅)

version = "1.0.0"

[6.7476]

[6.7494]

version = "1.0.1"
replacement in Cargo.lock at line 2118

[6.7559]→[6.7559:7637](∅→∅),[6.7559]→[6.7559:7637](∅→∅)

checksum = "92a265e0c5b89a31cb939a9d7ffce63382e450af10df56a3b9bfb7084d3c2178"

[6.7559]

[6.7637]

checksum = "287a760af78a7d607cb231500c06009ea1e0599cd57b10c32760061979bab1f1"
edit in Cargo.lock at line 2389

[6.1090066]

[6.1090066]

[[package]]
name = "wyz"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "85e60b0d1b5f99db2556934e21937020776a5d31520bf169e851ac44e6420214"