The sound distributed version control system

#826 Name conflict I do not expect

Opened by tankf33der on August 15, 2023
tankf33der on August 15, 2023
$ pijul init p1
$ cd p1
$ touch a
$ pijul add a
$ pijul record -am.
Hash: 3YD4ZFWRBFRD4TTQFP67JKSQNSLPGMQRDGV5S76QR3ZOMMUFP2CQC
$ echo "2" >> a
$ pijul record -am.
Hash: HLKGWCZFFNVULJ3LJT5J5HONTQM7AOU6ZJUR7VMZLQXNFTAL5VIQC
$ cd ..
$ pijul clone p1 p2
$ cd p2
$ pijul log --hash-only
HLKGWCZFFNVULJ3LJT5J5HONTQM7AOU6ZJUR7VMZLQXNFTAL5VIQC
3YD4ZFWRBFRD4TTQFP67JKSQNSLPGMQRDGV5S76QR3ZOMMUFP2CQC
EM4B4444SY3L6IZ3VY24AGOLT73QIUQX3ZOCRUUT3JBBNROP7WZQC
$ pijul unrec HL 3Y EM
$ pijul pull -a
  Downloading changes [==================================================] 3/3
             Applying [==================================================] 3/3
   Completing changes [==================================================] 0/0
Outputting repository ↖

There were conflicts:

  - Name conflict on "a"
  - Name conflict on "a"
$ ls -l
total 8
-rw-r--r-- 1 root root 2 Aug 15 18:23 a
-rw-r--r-- 1 root root 2 Aug 15 18:23 a.3YD4ZFWRBFRD4
$