##// END OF EJS Templates
fetch: switch the default parent used for a merge...
fetch: switch the default parent used for a merge This treats newly pulled changes as authoritative, and local changes as the "satellite" changes. The prior default behaviour is still available, via the --switch-parent option.

File last commit:

r5914:8e7796a9 default
r6206:0b6f1249 default
Show More
test-strip-cross
68 lines | 1.1 KiB | text/plain | TextLexer
Alexis S. L. Carvalho
strip: calculate list of extra nodes to save and pass it to changegroupsubset...
r5909 #!/bin/sh
# test stripping of filelogs where the linkrev doesn't always increase
echo '[extensions]' >> $HGRCPATH
echo 'hgext.mq =' >> $HGRCPATH
hg init orig
cd orig
hidefilename()
{
sed -e 's/saving bundle to .*strip-backup/saving bundle to strip-backup/'
}
commit()
{
hg up -qC null
count=1
for i in "$@"; do
for f in $i; do
echo $count > $f
done
count=`expr $count + 1`
done
hg commit -qAm "$*"
}
# 2 1 0 2 0 1 2
commit '201 210'
commit '102 120' '210'
commit '021'
commit '201' '021 120'
commit '012 021' '102 201' '120 210'
Alexis S. L. Carvalho
test-strip-cross: test handling of linkrev crosses in the manifest
r5912 commit 'manifest-file'
Alexis S. L. Carvalho
strip: calculate list of extra nodes to save and pass it to changegroupsubset...
r5909 commit '102 120' '012 210' '021 201'
commit '201 210' '021 120' '012 102'
Alexis S. L. Carvalho
fix test-strip-cross on solaris...
r5914 HGUSER=another-user; export HGUSER
commit 'manifest-file'
Alexis S. L. Carvalho
test-strip-cross: test handling of linkrev crosses in the manifest
r5912
commit '012' 'manifest-file'
Alexis S. L. Carvalho
strip: calculate list of extra nodes to save and pass it to changegroupsubset...
r5909 cd ..
Alexis S. L. Carvalho
test-strip-cross: test handling of linkrev crosses in the manifest
r5912 hg clone -q -U -r -1 -r -2 -r -3 -r -4 -r -6 orig crossed
Alexis S. L. Carvalho
strip: calculate list of extra nodes to save and pass it to changegroupsubset...
r5909
Richard Lowe
Fix test-strip-cross on Solaris...
r5911 for i in crossed/.hg/store/00manifest.i crossed/.hg/store/data/*.i; do
Alexis S. L. Carvalho
strip: calculate list of extra nodes to save and pass it to changegroupsubset...
r5909 echo $i
hg debugindex $i
echo
done
Alexis S. L. Carvalho
test-strip-cross: test handling of linkrev crosses in the manifest
r5912 for i in 0 1 2 3 4; do
Alexis S. L. Carvalho
strip: calculate list of extra nodes to save and pass it to changegroupsubset...
r5909 hg clone -q -U --pull crossed $i
echo "% Trying to strip revision $i"
hg --cwd $i strip $i 2>&1 | hidefilename
echo "% Verifying"
hg --cwd $i verify
echo
done