The sound distributed version control system

#321 pijul unrecord, reset empty conflict

Closed on July 7, 2021
ambersz on February 13, 2021

.sh to replicate:

pijul init repo
cd repo
touch file 
pijul add file
pijul record -am "empty file"
pijul fork a2
echo "A" >> file
export HASH="$(pijul record -am "A1" 2>&1 | cut -d' ' -f2)"
echo "$HASH"
pijul channel switch a2
echo "A" >> file
pijul record -am "A2"
pijul apply $HASH
pijul unrecord $HASH
pijul reset
cat file
# expected:
# A

# actual:
# >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
# ================================
# A
# <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
tankf33der on February 14, 2021

@ambersz - cant repeat on latest nest’s pijul. Your version is not alpha.38 right?

BTW, to get a $HASH i would use:

...
$ pijul rec -am"."
$ H=$(pijul log --hash-only | head -1)
$ echo $H
KIJXYOT6CHMVAFLCE5HCCXEYOHS33VTY56JOBPGAH2V236M6QMMQC
...
ambersz on February 14, 2021

@tankf33der This is my version:

pijul -V
pijul 1.0.0-alpha.38

It might be related to my Windows 10 / WSL2 (Ubuntu) environment if you can’t replicate it.

Thanks, I’ll use that method to get the hash in the future!

pmeunier on July 7, 2021

Hi! Thanks for the report, I tested this again today, and it works. I can see a large number of possibilities to explain why it didn’t work in February, though.

pmeunier closed this discussion on July 7, 2021