pijul/pijul - Change VQQ23NP72KUK32D2LSTBIWXO5UV47RQAPQ4QA5B4V3EPYG4ZZ5WAC

Fix conflicts

Created by pmeunier on December 26, 2025

VQQ23NP72KUK32D2LSTBIWXO5UV47RQAPQ4QA5B4V3EPYG4ZZ5WAC

Dependencies

In channels

main

Change contents

Deletion in rustfmt.toml at line 1 [7.15]
B:BD[7.15] → [8.0:17]
```
edition = "2024"
```

Replacement in pijul-remote/src/lib.rs at line 1043 [10.52474]

B:BD[9.835] → [6.0:39]

                let mut working_copy =

[9.835]

[6.39]

                let working_copy =

Replacement in pijul-remote/src/lib.rs at line 1059 [10.52474]

B:BD[6.368] → [6.368:411]

                        &mut working_copy,

[6.368]

[6.411]

                        &working_copy,

Replacement in pijul-remote/src/lib.rs at line 1067 [10.52474]

∅:D[11.551] → [10.61657:61724]

∅:D[12.9110] → [10.61657:61724]

B:BD[10.61657] → [10.61657:61724]

                    txn.archive(&changes, &channel, &mut tarball)?

[11.551]

[10.61724]

                    txn.archive::<_, _, libpijul::working_copy::filesystem::FileSystem>(
                        &changes,
                        &channel,
                        &mut tarball,
                    )?

Deletion in pijul/src/commands/tag.rs at line 260 [14.74]
B:BD[13.163] → [5.137:217]
BD:BD[13.163] → [5.137:217]
```
            if let Ok(header) = toml::from_str(&std::str::from_utf8(&bytes)?) {
```
Solving an order conflict in pijul/src/commands/tag.rs at line 260 [14.74]
[15.117]
[13.222]
Deletion in pijul/src/commands/tag.rs at line 291 [14.74]
B:BD[16.1459] → [2.1956:1956]
B:BD[14.5248] → [5.76:136]
BD:BD[14.5248] → [5.76:136]
∅:D[5.136] → [18.50:50]
BD:BD[19.1315] → [18.50:50]
```
            chrono::DateTime::from_timestamp(t, 0).unwrap()
```
Solving an order conflict in pijul/src/commands/tag.rs at line 291 [14.74]
[16.1459]

Replacement in pijul/src/commands/reset.rs at line 180 [10.97650]

B:BD[20.10165] → [21.90:130]

                    paths.insert(path);

[20.10165]

[20.10202]

                    paths.insert(path.join("/"));

Replacement in pijul/src/commands/record.rs at line 161 [10.101759]

B:BD[22.208] → [5.218:294]

                        "signature": secret.sign_raw(&hash_bytes).unwrap(),

[22.208]

[22.286]

                        "signature": secret.sign_raw(&hash.to_bytes()).unwrap(),

Deletion in pijul/src/commands/record.rs at line 255 [10.101759]
B:BD[10.105980] → [5.295:359]
BD:BD[10.105980] → [5.295:359]
```
                chrono::DateTime::from_timestamp(t, 0).unwrap()
```
Solving an order conflict in pijul/src/commands/record.rs at line 255 [10.101759]
[17.1595]
[23.1459]

Replacement in pijul/src/commands/pushpull.rs at line 844 [10.111631]

B:BD[24.10897] → [25.98:150]

                        touched_paths.insert(path);

[24.10897]

[24.10946]

                        touched_paths.insert(path.join("/"));

Insertion in pijul/src/commands/protocol.rs at line 49 [10.123281]
[10.124745]
[10.124745]
```
type W = libpijul::working_copy::filesystem::FileSystem;
```

Replacement in pijul/src/commands/protocol.rs at line 295 [10.123281]

B:BD[24.12446] → [11.601:677]

                        txn.archive(&repo.changes, &channel, &mut tarball)?

[24.12446]

[10.131952]

                        txn.archive::<_, _, W>(&repo.changes, &channel, &mut tarball)?

Replacement in pijul/src/commands/protocol.rs at line 320 [10.123281]

B:BD[10.132737] → [11.926:998]

                    txn.archive(&repo.changes, &channel, &mut tarball)?

[10.132737]

[10.132809]

                    txn.archive::<_, _, W>(&repo.changes, &channel, &mut tarball)?

Replacement in pijul/src/commands/archive.rs at line 123 [10.191083]

B:BD[26.4819] → [11.2889:2957]

                txn.archive(&repo.changes, &channel, &mut tarball)?

[10.193815]

[10.194009]

                type W = libpijul::working_copy::filesystem::FileSystem;
                txn.archive::<_, _, W>(&repo.changes, &channel, &mut tarball)?

Replacement in pijul/src/commands/apply.rs at line 122 [10.194289]

B:BD[27.138] → [27.138:188]

                        touched_files.push(path);

[27.138]

[28.1908]

                        touched_files.push(path.join("/"));

Deletion in pijul/Cargo.toml at line 54 [10.196374]
B:BD[10.197381] → [5.530:550]
BD:BD[10.197381] → [5.530:550]
B:BD[10.197652] → [5.551:564]
BD:BD[10.197652] → [5.551:564]
```
human-panic = "2.0"
toml = "0.8"
```
Solving an order conflict in pijul/Cargo.toml at line 54 [10.196374]
[29.3375]
[15.118]
Resurrecting zombie bytes in pijul/Cargo.toml at line 55 [10.196374]
∅:∅[15.140] → [29.3376:3448]
B:B[10.197665] → [29.3376:3448]
BD:B[15.140] → [29.3376:3448]
BD:B[10.197665] → [29.3376:3448]
```
url.workspace = true
validator.workspace = true
whoami.workspace = true
```
Insertion in pijul/Cargo.toml at line 58 [10.196374]
[29.3448]
[30.0]
Deletion in pijul/Cargo.toml at line 64 [10.196374]
B:BD[31.146] → [5.565:606]
BD:BD[31.146] → [5.565:606]
B:BD[32.1650] → [5.607:650]
BD:BD[32.1650] → [5.607:650]
```
thrussh = "0.35.4"
thrussh-keys = "0.22"
hex = { version = "0.4", optional = true }
```
Solving an order conflict in pijul/Cargo.toml at line 64 [10.196374]
[29.3526]
Solving an order conflict in oldshell.nix at line 17 [33.37]
[4.9]
[5.802]
Deletion in oldshell.nix at line 23 [33.37]
B:BD[5.951] → [5.951:960]
```
    wine
```

Deletion in libpijul/src/text_encoding.rs at line 62 [34.19]

B:BD[34.919] → [3.0:434]


impl<'de> Visitor<'de> for EncodingVisitor {
    type Value = Encoding;
    fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
        formatter.write_str("a string label meeting the encoding standard https://encoding.spec.whatwg.org/#concept-encoding-get")
    }
    fn visit_str<E>(self, v: &str) -> Result<Self::Value, E>
    where
        E: serde::de::Error,
    {
        Ok(Encoding::for_label(v))
    }
}

Replacement in libpijul/src/changestore/filesystem.rs at line 93 [10.824013]

B:BD[10.825893] → [10.825893:825954]

    fn load<F: Fn(ChangeId) -> Option<Hash>>(
        &self,

[10.825893]

[10.825954]

    fn load<'a, F: Fn(ChangeId) -> Option<Hash>>(
        &'a self,

Fix conflicts

Dependencies

In channels

Change contents

Deletion in rustfmt.toml at line 1 [7.15]

Replacement in pijul-remote/src/lib.rs at line 1043 [10.52474]

Replacement in pijul-remote/src/lib.rs at line 1059 [10.52474]

Replacement in pijul-remote/src/lib.rs at line 1067 [10.52474]

Deletion in pijul/src/commands/tag.rs at line 260 [14.74]

Solving an order conflict in pijul/src/commands/tag.rs at line 260 [14.74]

Deletion in pijul/src/commands/tag.rs at line 291 [14.74]

Solving an order conflict in pijul/src/commands/tag.rs at line 291 [14.74]

Replacement in pijul/src/commands/reset.rs at line 180 [10.97650]

Replacement in pijul/src/commands/record.rs at line 161 [10.101759]

Deletion in pijul/src/commands/record.rs at line 255 [10.101759]

Solving an order conflict in pijul/src/commands/record.rs at line 255 [10.101759]

Replacement in pijul/src/commands/pushpull.rs at line 844 [10.111631]

Insertion in pijul/src/commands/protocol.rs at line 49 [10.123281]

Replacement in pijul/src/commands/protocol.rs at line 295 [10.123281]

Replacement in pijul/src/commands/protocol.rs at line 320 [10.123281]

Replacement in pijul/src/commands/archive.rs at line 123 [10.191083]

Replacement in pijul/src/commands/apply.rs at line 122 [10.194289]

Deletion in pijul/Cargo.toml at line 54 [10.196374]

Solving an order conflict in pijul/Cargo.toml at line 54 [10.196374]

Resurrecting zombie bytes in pijul/Cargo.toml at line 55 [10.196374]

Insertion in pijul/Cargo.toml at line 58 [10.196374]

Deletion in pijul/Cargo.toml at line 64 [10.196374]

Solving an order conflict in pijul/Cargo.toml at line 64 [10.196374]

Solving an order conflict in oldshell.nix at line 17 [33.37]

Deletion in oldshell.nix at line 23 [33.37]

Deletion in libpijul/src/text_encoding.rs at line 62 [34.19]

Replacement in libpijul/src/changestore/filesystem.rs at line 93 [10.824013]