laumann/pijul - Change CX2FTBQUYK4BPKDW3LNX4VS7O2EALLEY4VI7PSOZRAEJ5J4B664QC

Fixing compilation errors in

Created by pmeunier on February 23, 2023

CX2FTBQUYK4BPKDW3LNX4VS7O2EALLEY4VI7PSOZRAEJ5J4B664QC

Dependencies

In channels

main

Change contents

Replacement in libpijul/src/tests/unrecord.rs at line 275 [3.248807]

∅:D[2.49] → [3.258398:258473]

B:BD[3.258398] → [3.258398:258473]

            Conflict::ZombieFile { ref path } => assert_eq!(path, "file"),

[2.49]

[3.258473]

            Conflict::ZombieFile { ref path, .. } => assert_eq!(path, "file"),

Replacement in libpijul/src/tests/unrecord.rs at line 340 [3.248807]

B:BD[3.260745] → [3.260745:260815]

        Conflict::ZombieFile { ref path } => assert_eq!(path, "a/b"),

[3.260745]

[3.260815]

        Conflict::ZombieFile { ref path, .. } => assert_eq!(path, "a/b"),

Replacement in libpijul/src/tests/unrecord.rs at line 344 [3.248807]

B:BD[3.260886] → [3.260886:260958]

        Conflict::ZombieFile { ref path } => assert_eq!(path, "a/b/c"),

[3.260886]

[3.260958]

        Conflict::ZombieFile { ref path, .. } => assert_eq!(path, "a/b/c"),

Insertion in libpijul/src/tests/file_conflicts.rs at line 939 [3.305506]

[4.40693]

            changes: Vec::new(),
            inode: [Position::ROOT],

Insertion in libpijul/src/tests/file_conflicts.rs at line 944 [3.305506]

[4.40774]

            changes: Vec::new(),
            inode: [Position::ROOT],

Insertion in libpijul/src/tests/file_conflicts.rs at line 949 [3.305506]

[4.40860]

            changes: Vec::new(),
            inode: [Position::ROOT],

Insertion in libpijul/src/tests/file_conflicts.rs at line 955 [3.305506]

[4.40963]

            changes: Vec::new(),
            inode_vertex: [Position::ROOT],
            id: 0,

Replacement in libpijul/src/tests/file_conflicts.rs at line 1111 [3.305506]

∅:D[2.554] → [3.341439:341517]

B:BD[3.341439] → [3.341439:341517]

        Conflict::ZombieFile { ref path } => assert_eq!(path, "a/b/c/alice"),

[2.554]

[3.341517]

        Conflict::ZombieFile { ref path, .. } => assert_eq!(path, "a/b/c/alice"),

Replacement in libpijul/src/tests/file_conflicts.rs at line 1196 [3.305506]

∅:D[2.600] → [5.6103:6181]

B:BD[5.6103] → [5.6103:6181]

        Conflict::ZombieFile { ref path } => assert_eq!(path, "a/b/c/alice"),

[2.600]

[3.344572]

        Conflict::ZombieFile { ref path, .. } => assert_eq!(path, "a/b/c/alice"),

Replacement in libpijul/src/tests/file_conflicts.rs at line 1216 [3.305506]

∅:D[2.646] → [3.345044:345145]

B:BD[3.345044] → [3.345044:345145]

        Conflict::ZombieFile { ref path } => assert!(path == "a/b/c/file" || path == "a/b/c/alice"),

[2.646]

[3.345145]

        Conflict::ZombieFile { ref path, .. } => assert!(path == "a/b/c/file" || path == "a/b/c/alice"),

Replacement in libpijul/src/tests/file_conflicts.rs at line 1236 [3.305506]

∅:D[2.692] → [3.345602:345703]

B:BD[3.345602] → [3.345602:345703]

        Conflict::ZombieFile { ref path } => assert!(path == "a/b/c/file" || path == "a/b/c/alice"),

[2.692]

[3.345703]

        Conflict::ZombieFile { ref path, .. } => assert!(path == "a/b/c/file" || path == "a/b/c/alice"),

Replacement in libpijul/src/tests/file_conflicts.rs at line 1308 [3.305506]

∅:D[2.738] → [3.348030:348107]

B:BD[3.348030] → [3.348030:348107]

        Conflict::ZombieFile { ref path } => assert_eq!(path, "alice/file"),

[2.738]

[3.348107]

        Conflict::ZombieFile { ref path, .. } => assert_eq!(path, "alice/file"),

Replacement in libpijul/src/tests/file_conflicts.rs at line 1352 [3.305506]

∅:D[2.784] → [3.349305:349382]

B:BD[3.349305] → [3.349305:349382]

        Conflict::ZombieFile { ref path } => assert_eq!(path, "alice/file"),

[2.784]

[3.349382]

        Conflict::ZombieFile { ref path, .. } => assert_eq!(path, "alice/file"),

Replacement in libpijul/src/tests/file_conflicts.rs at line 1542 [3.305506]
∅:D[2.830] → [3.355630:355700]
B:BD[3.355630] → [3.355630:355700]
```
        Conflict::ZombieFile { ref path } => assert_eq!(path, "dir"),
```
[2.830]
[3.355700]
```
        Conflict::ZombieFile { ref path, .. } => assert_eq!(path, "dir"),
```
Replacement in libpijul/src/tests/file_conflicts.rs at line 1580 [3.305506]
∅:D[2.876] → [3.356699:356769]
B:BD[3.356699] → [3.356699:356769]
```
        Conflict::ZombieFile { ref path } => assert_eq!(path, "dir"),
```
[2.876]
[3.356769]
```
        Conflict::ZombieFile { ref path, .. } => assert_eq!(path, "dir"),
```

Replacement in libpijul/src/tests/add_file.rs at line 570 [3.454125]

∅:D[2.1094] → [3.472621:472693]

B:BD[3.472621] → [3.472621:472693]

            Conflict::ZombieFile { ref path } => assert_eq!(path, "a"),

[2.1094]

[3.472693]

            Conflict::ZombieFile { ref path, .. } => assert_eq!(path, "a"),