laumann/pijul-conflicts - Change ZXGWSXWJPY64MV7HXBFZTUVCXEFPM5VBNYGSZI5ANIDKK54GY65QC

test.sh: hide conflicts from pijul apply

Those conflicts are about to be listed by our own pijul-conflicts, no need to see them twice.

Created by laumann on June 14, 2023

ZXGWSXWJPY64MV7HXBFZTUVCXEFPM5VBNYGSZI5ANIDKK54GY65QC

Dependencies

In channels

main

Change contents

Replacement in test.sh at line 27 [2.32]

B:BD[2.469] → [2.469:534]

pijul apply "$(pijul log --channel alice --hash-only --limit 1)"

[2.469]

[2.534]

pijul apply "$(pijul log --channel alice --hash-only --limit 1)" 2> /dev/null

Insertion in test.sh at line 32 [2.32]
[2.562]
```
rm -rf "${REPO}"
```

Replacement in README.md at line 17 [4.34]

B:BD[3.39] → [3.39:133]

Repository created at /tmp/tmp.WROc51mcRs
/tmp/tmp.WROc51mcRs ~/sources/pijul/pijul-conflicts

[3.39]

[3.133]

Repository created at /tmp/tmp.9zEucXHwmf
/tmp/tmp.9zEucXHwmf ~/sources/pijul/pijul-conflicts

Replacement in README.md at line 20 [4.34]

B:BD[3.151] → [3.151:211]

Hash: 6ECVR7JPVZHH5SUVHED4ACAROU2W3RDQSW6VR2Q3XHWECIZX4ZGAC

[3.151]

[3.211]

Hash: XEV3C5VQ6YGEOTUEVQOMXCQDQGXKKRCQICOCLSLJ6Y5KOMTPPXCAC

Replacement in README.md at line 22 [4.34]

B:BD[3.253] → [3.253:313]

Hash: R65AMJ6YOZ6E7F5OVXYQCP53XENVJKZIQG2CGBCGEMCLWMEJ6JYAC

[3.253]

[3.313]

Hash: LB3DIKQ2M7XPJBXB2FGR5U2APBQN7P7BN7A5OKXBGHGOMDFWEPPAC

Replacement in README.md at line 24 [4.34]

B:BD[3.355] → [3.355:543]

Hash: GPOAAT2TCA7QP2LSPTMUQI4CCQSZQS75DNTFTTL7ZYULIWVV4SMQC
There were conflicts:
  - Order conflict in "file.txt" starting on line 2
  - Order conflict in "file.txt" starting on line 2

[3.355]

[3.543]

Hash: YNHLT3DHY7YAIAUM4LH2O4DPZURDPHH6FB5MVPANYMFZXLY47ABQC

Replacement in README.md at line 26 [4.34]

B:BD[3.559] → [3.559:816]

[Order { path: "file.txt", inode_vertex: [Position { change: ChangeId(6ECVR7JPVZHH4), pos: ChangePosition(L64(1)) }], line: 2, changes: [GPOAAT2TCA7QP2LSPTMUQI4CCQSZQS75DNTFTTL7ZYULIWVV4SMQC, R65AMJ6YOZ6E7F5OVXYQCP53XENVJKZIQG2CGBCGEMCLWMEJ6JYAC], id: 1 }]

[3.559]

[3.816]

[Order { path: "file.txt", inode_vertex: [Position { change: ChangeId(XEV3C5VQ6YGEO), pos: ChangePosition(L64(1)) }], line: 2, changes: [YNHLT3DHY7YAIAUM4LH2O4DPZURDPHH6FB5MVPANYMFZXLY47ABQC, LB3DIKQ2M7XPJBXB2FGR5U2APBQN7P7BN7A5OKXBGHGOMDFWEPPAC], id: 1 }]

Insertion in README.md at line 41 [4.34]
[4.690]
[4.690]
```
 - Clean up all the `.unwrap()`s
```