mx00s/pijul - Change XSEODPNEN2Y2THBRO7L5QFPAEQVSQTLAFZFWCRMBGZ3YSRZB2UJAC

Fixing conflicts

Created by pmeunier on March 2, 2021

XSEODPNEN2Y2THBRO7L5QFPAEQVSQTLAFZFWCRMBGZ3YSRZB2UJAC

Dependencies

In channels

main

Change contents

File move: text.rs (-rw-r--r--), text.rs (-rw-r--r--), text.rs (-rwxr-xr-x) → text.rs (----------)
BF:BFD[6.248792] → [7.0:9]
BF:BFD[6.248792] → [8.366:375]
BF:BFD[6.248792] → [9.2008:2017]
[6.248792]
[7.10]
File move: data (drwxr-xr-x) → data (d--x------)
BF:BFD[6.248792] → [7.4368:4374]
[6.248792]
[7.4375]
File move: gb.2 (-rw-r--r--) → gb.2 (----------)
BF:BFD[7.4375] → [7.4376:4382]
[7.4375]
[7.4383]
File move: gb.1 (-rw-r--r--) → gb.1 (----------)
BF:BFD[7.4375] → [7.4441:4447]
[7.4375]
[7.4448]
File move: 8859-1.2 (-rw-r--r--) → 8859-1.2 (----------)
BF:BFD[7.4375] → [7.4506:4516]
[7.4375]
[7.4517]
File move: 8859-1.1 (-rw-r--r--) → 8859-1.1 (----------)
BF:BFD[7.4375] → [7.4579:4589]
[7.4375]
[7.4590]
File move: 1252.2 (-rw-r--r--) → 1252.2 (----------)
BF:BFD[7.4375] → [7.4652:4660]
[7.4375]
[7.4661]
File move: 1252.1 (-rw-r--r--) → 1252.1 (----------)
BF:BFD[7.4375] → [7.4716:4724]
[7.4375]
[7.4725]
File move: 1252-dos.2 (-rw-r--r--) → 1252-dos.2 (----------)
BF:BFD[7.4375] → [5.104:116]
[7.4375]
[5.117]
File move: 1252-dos.1 (-rw-r--r--) → 1252-dos.1 (----------)
BF:BFD[7.4375] → [5.172:184]
[7.4375]
[5.185]
Solving a name conflict: mod.rs, mod.rs, mod.rs
BF:BFD[6.768883] → [8.376:384]
BF:BFD[6.768883] → [9.2937:2945]
BF:BFD[6.768883] → [6.793238:793246]

Replacement in libpijul/src/change/text_changes.rs at line 434 [10.37976]

B:BD[10.52618] → [11.1945:2008]

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

[10.52618]

[11.2008]

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

Replacement in libpijul/src/change/text_changes.rs at line 443 [10.37976]

B:BD[11.2320] → [11.2320:2346]

B:BD[10.52618] → [9.3390:3523]

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

[11.2320]

[10.52730]

                        },
                        encoding_label

Replacement in libpijul/src/change/text_changes.rs at line 553 [10.37976]

B:BD[10.57069] → [2.156:286]

B:BD[10.57069] → [9.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();

[10.57069]

[10.57195]

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

Resurrecting zombie bytes in "libpijul/src/change/text_changes.rs" at line 1295 [10.37976]

B:B[10.86184] → [3.0:95]

BD:B[10.86184] → [3.0:95]

                if !buf.ends_with(b"\n") {
                    writeln!(w)?;
                }

Insertion in libpijul/src/change/text_changes.rs at line 1295 [10.37976]
[10.86133]
[3.0]
```
                print_contents(w, "-", &buf[..], &None)?;
```
Deletion in libpijul/src/change/text_changes.rs at line 1299 [10.37976]
B:BD[10.86133] → [8.640:698]
```
                print_contents(w, "-", &buf[..], &None)?;
```

Insertion in Cargo.lock at line 105 [6.1030385]

[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]]

Insertion in Cargo.lock at line 526 [6.1030385]

[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.1030385]
B:BD[7.6432] → [7.6432:6450]
```
version = "0.7.4"
```
[7.6432]
[7.6450]
```
version = "0.7.5"
```

Replacement in Cargo.lock at line 917 [6.1030385]

B:BD[7.6515] → [7.6515:6593]

checksum = "db65c6da02e61f55dae90a0ae427b2a5f6b3e8db09f58d10efab23af92592616"

[7.6515]

[7.6593]

checksum = "21f866863575d0e1d654fbeeabdc927292fdf862873dc3c96c6f753357e13374"

Replacement in Cargo.lock at line 921 [6.1030385]
B:BD[7.6636] → [7.6636:6654]
```
 "cfg-if 0.1.10",
```
[7.6636]
[7.6654]
```
 "cfg-if 1.0.0",
```
Replacement in Cargo.lock at line 928 [6.1030385]
B:BD[6.1054747] → [12.154560:154579]
```
version = "0.2.86"
```
[6.1054747]
[6.1054766]
```
version = "0.2.87"
```

Replacement in Cargo.lock at line 930 [6.1030385]

B:BD[6.1054831] → [12.154580:154658]

checksum = "b7282d924be3275cec7f6756ff4121987bc6481325397dde6ba3e7802b1a8b1c"

[6.1054831]

[6.1054909]

checksum = "265d751d31d6780a3f956bb5b8022feba2d94eeee5a84ba64f4212eedca42213"

Replacement in Cargo.lock at line 1146 [6.1030385]
B:BD[7.6768] → [7.6768:6786]
```
version = "5.1.2"
```
[7.6768]
[7.6786]
```
version = "6.1.2"
```

Replacement in Cargo.lock at line 1148 [6.1030385]

B:BD[7.6851] → [7.6851:6929]

checksum = "ffb4262d26ed83a1c0a33a38fe2bb15797329c85770da05e6b828ddb782627af"

[7.6851]

[7.6929]

checksum = "e7413f999671bd4745a7b624bd370a569fb6bc574b23c83a3c5ed2e453f3d5e2"

Insertion in Cargo.lock at line 1150 [6.1030385]
[7.6946]
[7.6946]
```
 "bitvec",
 "funty",
```
Replacement in Cargo.lock at line 1214 [6.1030385]
B:BD[6.1061717] → [12.155548:155566]
```
version = "1.7.0"
```
[6.1061717]
[6.1061735]
```
version = "1.7.2"
```

Replacement in Cargo.lock at line 1216 [6.1030385]

B:BD[6.1061800] → [12.155567:155645]

checksum = "10acf907b94fc1b1a152d08ef97e7759650268cf986bf127f387e602b02c7e5a"

[6.1061800]

[6.1061878]

checksum = "af8b08b04175473088b46763e51ee54da5f9a164bc162f615b91bc179dbf15a3"

Replacement in Cargo.lock at line 1394 [6.1030385]
B:BD[6.1065701] → [13.2135:2153]
```
version = "0.2.4"
```
[6.1065701]
[14.1392]
```
version = "0.2.5"
```

Replacement in Cargo.lock at line 1396 [6.1030385]

B:BD[14.1457] → [13.2154:2232]

checksum = "439697af366c49a6d0a010c56a0d97685bc140ce0d377b13a2ea2aa42d64a827"

[14.1457]

[14.1535]

checksum = "0cf491442e4b033ed1c722cb9f0df5fcfcf4de682466c46469c36bc47dc5548a"

Insertion in Cargo.lock at line 1471 [6.1030385]

[6.1068075]

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

Insertion in Cargo.lock at line 1834 [6.1030385]

[6.1076034]

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

Resurrecting zombie bytes in "Cargo.lock" at line 2112 [6.1030385]
B:B[6.1082329] → [7.7436:7476]
BD:B[6.1082329] → [7.7436:7476]
```
]
[[package]]
name = "tree_magic_mini"
```
Replacement in Cargo.lock at line 2116 [6.1030385]
B:BD[7.7476] → [7.7476:7494]
BD:BD[7.7476] → [7.7476:7494]
```
version = "1.0.0"
```
[7.7476]
[7.7494]
```
version = "1.0.1"
```

Replacement in Cargo.lock at line 2118 [6.1030385]

B:BD[7.7559] → [7.7559:7637]

BD:BD[7.7559] → [7.7559:7637]

checksum = "92a265e0c5b89a31cb939a9d7ffce63382e450af10df56a3b9bfb7084d3c2178"

[7.7559]

[7.7637]

checksum = "287a760af78a7d607cb231500c06009ea1e0599cd57b10c32760061979bab1f1"

Insertion in Cargo.lock at line 2389 [6.1030385]

[6.1090066]


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

Fixing conflicts

Dependencies

In channels

Change contents

File move: text.rs (-rw-r--r--), text.rs (-rw-r--r--), text.rs (-rwxr-xr-x) → text.rs (----------)

File move: data (drwxr-xr-x) → data (d--x------)

File move: gb.2 (-rw-r--r--) → gb.2 (----------)

File move: gb.1 (-rw-r--r--) → gb.1 (----------)

File move: 8859-1.2 (-rw-r--r--) → 8859-1.2 (----------)

File move: 8859-1.1 (-rw-r--r--) → 8859-1.1 (----------)

File move: 1252.2 (-rw-r--r--) → 1252.2 (----------)

File move: 1252.1 (-rw-r--r--) → 1252.1 (----------)

File move: 1252-dos.2 (-rw-r--r--) → 1252-dos.2 (----------)

File move: 1252-dos.1 (-rw-r--r--) → 1252-dos.1 (----------)

Solving a name conflict: mod.rs, mod.rs, mod.rs

Replacement in libpijul/src/change/text_changes.rs at line 434 [10.37976]

Replacement in libpijul/src/change/text_changes.rs at line 443 [10.37976]

Replacement in libpijul/src/change/text_changes.rs at line 553 [10.37976]

Resurrecting zombie bytes in "libpijul/src/change/text_changes.rs" at line 1295 [10.37976]

Insertion in libpijul/src/change/text_changes.rs at line 1295 [10.37976]

Deletion in libpijul/src/change/text_changes.rs at line 1299 [10.37976]

Insertion in Cargo.lock at line 105 [6.1030385]

Insertion in Cargo.lock at line 526 [6.1030385]

Replacement in Cargo.lock at line 915 [6.1030385]

Replacement in Cargo.lock at line 917 [6.1030385]

Replacement in Cargo.lock at line 921 [6.1030385]

Replacement in Cargo.lock at line 928 [6.1030385]

Replacement in Cargo.lock at line 930 [6.1030385]

Replacement in Cargo.lock at line 1146 [6.1030385]

Replacement in Cargo.lock at line 1148 [6.1030385]

Insertion in Cargo.lock at line 1150 [6.1030385]

Replacement in Cargo.lock at line 1214 [6.1030385]

Replacement in Cargo.lock at line 1216 [6.1030385]

Replacement in Cargo.lock at line 1394 [6.1030385]

Replacement in Cargo.lock at line 1396 [6.1030385]

Insertion in Cargo.lock at line 1471 [6.1030385]

Insertion in Cargo.lock at line 1834 [6.1030385]

Resurrecting zombie bytes in "Cargo.lock" at line 2112 [6.1030385]

Replacement in Cargo.lock at line 2116 [6.1030385]

Replacement in Cargo.lock at line 2118 [6.1030385]

Insertion in Cargo.lock at line 2389 [6.1030385]