mirror of
https://github.com/facebook/sapling.git
synced 2024-10-07 15:27:13 +03:00
e7ff3ff5bc
New behavior is generally superior and more correct, except possibly
with regards to missing files. hg up . is now effectively a no-op,
which is probably the desired behavior for people expecting to move to
tip, but may surprise people who were expecting deleted files to
reappear.
case 1: update to .
a-w -> a-w
classic: ancestor a
missing recreated right?
rmed recreated WRONG
added forgotten WRONG
changed preserved RIGHT
conflicted can't happen
backward merge: ancestor a (NO EFFECT)
missing missing wrong?
rm'ed rm'ed RIGHT
added preserved RIGHT
changed preserved RIGHT
conflicted can't happen
case 2: update to ancestor of .
a-b-w -> b-w
\
a
classic: ancestor a
missing recreated right?
rmed recreated wrong?
added forgotten wrong?
changed preserved RIGHT
conflicted preserved wrong?
backwards merge: ancestor b
missing missing or conflict right?
rm'ed missing or conflict right?
changed preserved RIGHT
conflicted merge RIGHT
added preserved right?
43 lines
607 B
Bash
Executable File
43 lines
607 B
Bash
Executable File
#!/bin/sh
|
|
|
|
hg init
|
|
|
|
cat > .hg/hgrc <<EOF
|
|
[encode]
|
|
*.gz = gzip -d
|
|
|
|
[decode]
|
|
*.gz = gzip
|
|
|
|
EOF
|
|
|
|
echo "this is a test" | gzip > a.gz
|
|
hg add a.gz
|
|
hg ci -m "test" -d "1000000 0"
|
|
echo %% no changes
|
|
hg status
|
|
touch a.gz
|
|
|
|
echo %% no changes
|
|
hg status
|
|
|
|
echo %% uncompressed contents in repo
|
|
hg debugdata .hg/store/data/a.gz.d 0
|
|
|
|
echo %% uncompress our working dir copy
|
|
gunzip < a.gz
|
|
|
|
rm a.gz
|
|
hg co -C
|
|
|
|
echo %% uncompress our new working dir copy
|
|
gunzip < a.gz
|
|
|
|
echo %% check hg cat operation
|
|
hg cat a.gz
|
|
hg cat --decode a.gz | gunzip
|
|
mkdir subdir
|
|
cd subdir
|
|
hg -R .. cat ../a.gz
|
|
hg -R .. cat --decode ../a.gz | gunzip
|