Chasesomero/pijul - Change VGTHZH5MWGH37ZSZWHDGYBOAXJAKELHAE6LLOZNMESPAN2PNXR6QC

Fixing the tests related to conflict numbers

These hadn't been updated when we started the numbers at 1 instead of 0

Created by pmeunier on December 28, 2025

VGTHZH5MWGH37ZSZWHDGYBOAXJAKELHAE6LLOZNMESPAN2PNXR6QC

Dependencies

In channels

main

Change contents

Replacement in libpijul/src/tests/missing_context.rs at line 123 [4.291589]

B:BD[3.684] → [3.684:745]

            Ok(&"a\n>>>>>>> 0\nx\ny\nz\n<<<<<<< 0\nf\n"[..])

[3.684]

[4.294642]

            Ok(&"a\n>>>>>>> 1\nx\ny\nz\n<<<<<<< 1\nf\n"[..])

Replacement in libpijul/src/tests/missing_context.rs at line 128 [4.291589]

B:BD[3.786] → [3.786:841]

            Ok(&">>>>>>> 0\nx\ny\nz\n<<<<<<< 0\n"[..])

[3.786]

[4.294822]

            Ok(&">>>>>>> 1\nx\ny\nz\n<<<<<<< 1\n"[..])

Replacement in libpijul/src/tests/missing_context.rs at line 179 [4.291589]

B:BD[3.933] → [3.933:1016]

            Ok(&"a\n>>>>>>> 0\nx\n<<<<<<< 0\ny\n>>>>>>> 1\nz\n<<<<<<< 1\nf\n"[..])

[3.933]

[4.296269]

            Ok(&"a\n>>>>>>> 1\nx\n<<<<<<< 1\ny\n>>>>>>> 2\nz\n<<<<<<< 2\nf\n"[..])

Replacement in libpijul/src/tests/missing_context.rs at line 184 [4.291589]

B:BD[3.1057] → [3.1057:1112]

            Ok(&">>>>>>> 0\nx\ny\nz\n<<<<<<< 0\n"[..])

[3.1057]

[4.296449]

            Ok(&">>>>>>> 1\nx\ny\nz\n<<<<<<< 1\n"[..])

Replacement in libpijul/src/tests/conflict.rs at line 776 [4.357372]
B:BD[4.379289] → [4.379289:379318]
```
    // Bob edits and records
```
[4.379289]
[2.7051]
```
    // Bob inserts xy between a and b
```
Replacement in libpijul/src/tests/conflict.rs at line 783 [4.357372]
B:BD[4.379676] → [4.379676:379707]
```
    // Alice edits and records
```
[4.379676]
[2.7154]
```
    // Alice inserts xy between a and b (same as Bob)
```

Insertion in libpijul/src/tests/conflict.rs at line 789 [4.357372]

[5.58334]

[4.379952]


    crate::pristine::debug(
        &*txn.read(),
        &*channel_alice.read(),
        std::fs::File::create("alice0.dot").unwrap(),
    )?;

Insertion in libpijul/src/tests/conflict.rs at line 798 [4.357372]

[5.58405]

[4.380060]

    crate::pristine::debug(
        &*txn.read(),
        &*channel_alice.read(),
        std::fs::File::create("alice1.dot").unwrap(),
    )?;

Insertion in libpijul/src/tests/conflict.rs at line 820 [4.357372]

[5.58490]

[2.7259]

        // Delete b and x, insert pre/post before/after conflict
        // markers (except the closing marker).

Insertion in libpijul/src/tests/conflict.rs at line 834 [4.357372]
[4.380818]
[4.380882]
```
    debug!("{}", std::str::from_utf8(&buf).unwrap());
```

Insertion in libpijul/src/tests/conflict.rs at line 838 [4.357372]

[5.58629]

[4.380996]


    crate::pristine::debug(
        &*txn.read(),
        &*channel_alice.read(),
        std::fs::File::create("alice2.dot").unwrap(),
    )?;
    crate::pristine::debug(
        &*txn.read(),
        &*channel_bob.read(),
        std::fs::File::create("bob.dot").unwrap(),
    )?;

Replacement in libpijul/src/tests/conflict.rs at line 1248 [4.357372]

B:BD[3.3354] → [3.3354:3421]

        assert_eq!(conflict, vec![">>>>>>> 0", "x", "<<<<<<< 0"]);

[3.3354]

[4.393558]

        assert_eq!(conflict, vec![">>>>>>> 1", "x", "<<<<<<< 1"]);

Replacement in libpijul/src/tests/conflict.rs at line 1790 [4.357372]

B:BD[3.5057] → [3.5057:5134]

    assert_eq!(std::str::from_utf8(&buf_), Ok(">>>>>>> 0\nx\n<<<<<<< 0\n"));

[3.5057]

[4.409910]

    assert_eq!(std::str::from_utf8(&buf_), Ok(">>>>>>> 1\nx\n<<<<<<< 1\n"));

Replacement in libpijul/src/tests/conflict.rs at line 1830 [4.357372]

B:BD[3.5184] → [3.5184:5262]

    assert_eq!(std::str::from_utf8(&buf2_), Ok(">>>>>>> 0\nx\n<<<<<<< 0\n"));

[3.5184]

[5.67977]

    assert_eq!(std::str::from_utf8(&buf2_), Ok(">>>>>>> 1\nx\n<<<<<<< 1\n"));

Replacement in libpijul/src/tests/conflict.rs at line 1924 [4.357372]
B:BD[3.5412] → [3.5412:5458]
```
        Ok(">>>>>>> 0\nx\ny\nz\n<<<<<<< 0\n")
```
[3.5412]
[4.414149]
```
        Ok(">>>>>>> 1\nx\ny\nz\n<<<<<<< 1\n")
```