##// END OF EJS Templates
issue1577: fix broken test by assuming less about CVS output....
issue1577: fix broken test by assuming less about CVS output. Specifically, output of "cvs ci" varies unpredictably across CVS versions, so any test that includes the output of "cvs ci" is doomed to fail some of the time. This fixes that by discarding the output of "cvs ci".

File last commit:

r8049:99e5f97c default
r8081:6c3b8132 default
Show More
test-convert-svn-sink
136 lines | 2.5 KiB | text/plain | TextLexer
/ tests / test-convert-svn-sink
Bryan O'Sullivan
convert: add support for Subversion as a sink
r5513 #!/bin/sh
Mads Kiilerich
tests: Skip tests if they will fail because of outer repo...
r7429 "$TESTDIR/hghave" svn svn-bindings no-outer-repo || exit 80
Bryan O'Sullivan
convert: add support for Subversion as a sink
r5513
Patrick Mezard
test-convert-svn-sink: wrap repetitive svn checks in a function
r5808 fixpath()
{
tr '\\' /
}
svnupanddisplay()
{
(
Thomas Arendsen Hein
Removed trailing spaces from everything except test output
r6210 cd $1;
Patrick Mezard
test-convert-svn-sink: wrap repetitive svn checks in a function
r5808 svn up;
Augie Fackler
test-convert-svn-sink: rewrite output for svn compatibility...
r8049 svn st -v | fixpath | sed 's/ */ /g'
Patrick Mezard
test-convert-svn-sink: wrap repetitive svn checks in a function
r5808 limit=''
if [ $2 -gt 0 ]; then
limit="--limit=$2"
fi
Augie Fackler
test-convert-svn-sink: rewrite output for svn compatibility...
r8049 svn log --xml -v $limit | fixpath | sed 's,<date>.*,<date/>,' | grep -v 'kind="'
Thomas Arendsen Hein
Removed trailing spaces from everything except test output
r6210 )
Patrick Mezard
test-convert-svn-sink: wrap repetitive svn checks in a function
r5808 }
Bryan O'Sullivan
convert: add support for Subversion as a sink
r5513 echo "[extensions]" >> $HGRCPATH
echo "convert = " >> $HGRCPATH
hg init a
echo a > a/a
Patrick Mezard
test-convert-svn-sink: test directory additions
r5538 mkdir -p a/d1/d2
echo b > a/d1/d2/b
Bryan O'Sullivan
convert: add support for Subversion as a sink
r5513 echo % add
hg --cwd a ci -d '0 0' -A -m 'add a file'
Peter Arrenbrecht
convert: fix test-convert-svn-* problems with mtime not changing...
r6439 "$TESTDIR/svn-safe-append.py" a a/a
Bryan O'Sullivan
convert: add support for Subversion as a sink
r5513 echo % modify
hg --cwd a ci -d '1 0' -m 'modify a file'
hg --cwd a tip -q
hg convert -d svn a
Patrick Mezard
test-convert-svn-sink: wrap repetitive svn checks in a function
r5808 svnupanddisplay a-hg-wc 2
Bryan O'Sullivan
convert: add support for Subversion as a sink
r5513 ls a a-hg-wc
cmp a/a a-hg-wc/a && echo same || echo different
hg --cwd a mv a b
echo % rename
hg --cwd a ci -d '2 0' -m 'rename a file'
hg --cwd a tip -q
hg convert -d svn a
Patrick Mezard
test-convert-svn-sink: wrap repetitive svn checks in a function
r5808 svnupanddisplay a-hg-wc 1
Bryan O'Sullivan
convert: add support for Subversion as a sink
r5513 ls a a-hg-wc
hg --cwd a cp b c
echo % copy
hg --cwd a ci -d '3 0' -m 'copy a file'
hg --cwd a tip -q
hg convert -d svn a
Patrick Mezard
test-convert-svn-sink: wrap repetitive svn checks in a function
r5808 svnupanddisplay a-hg-wc 1
Bryan O'Sullivan
convert: add support for Subversion as a sink
r5513 ls a a-hg-wc
hg --cwd a rm b
echo % remove
hg --cwd a ci -d '4 0' -m 'remove a file'
hg --cwd a tip -q
hg convert -d svn a
Patrick Mezard
test-convert-svn-sink: wrap repetitive svn checks in a function
r5808 svnupanddisplay a-hg-wc 1
Bryan O'Sullivan
convert: add support for Subversion as a sink
r5513 ls a a-hg-wc
chmod +x a/c
echo % executable
hg --cwd a ci -d '5 0' -m 'make a file executable'
hg --cwd a tip -q
hg convert -d svn a
Patrick Mezard
test-convert-svn-sink: wrap repetitive svn checks in a function
r5808 svnupanddisplay a-hg-wc 1
Bryan O'Sullivan
convert: add support for Subversion as a sink
r5513 test -x a-hg-wc/c && echo executable || echo not executable
Maxim Dounin
convert: svn-sink: copy and set properties after adding dirs/files...
r5698 echo % executable in new directory
rm -rf a a-hg a-hg-wc
hg init a
mkdir a/d1
echo a > a/d1/a
chmod +x a/d1/a
hg --cwd a ci -d '0 0' -A -m 'add executable file in new directory'
hg convert -d svn a
Patrick Mezard
test-convert-svn-sink: wrap repetitive svn checks in a function
r5808 svnupanddisplay a-hg-wc 1
Maxim Dounin
convert: svn-sink: copy and set properties after adding dirs/files...
r5698 test -x a-hg-wc/d1/a && echo executable || echo not executable
echo % copy to new directory
mkdir a/d2
hg --cwd a cp d1/a d2/a
hg --cwd a ci -d '1 0' -A -m 'copy file to new directory'
hg convert -d svn a
Patrick Mezard
test-convert-svn-sink: wrap repetitive svn checks in a function
r5808 svnupanddisplay a-hg-wc 1
Maxim Dounin
convert: svn-sink: copy and set properties after adding dirs/files...
r5698
Bryan O'Sullivan
convert: add support for Subversion as a sink
r5513 echo % branchy history
hg init b
echo base > b/b
hg --cwd b ci -d '0 0' -Ambase
Peter Arrenbrecht
convert: fix test-convert-svn-* problems with mtime not changing...
r6439 "$TESTDIR/svn-safe-append.py" left-1 b/b
Bryan O'Sullivan
convert: add support for Subversion as a sink
r5513 echo left-1 > b/left-1
hg --cwd b ci -d '1 0' -Amleft-1
Peter Arrenbrecht
convert: fix test-convert-svn-* problems with mtime not changing...
r6439 "$TESTDIR/svn-safe-append.py" left-2 b/b
Bryan O'Sullivan
convert: add support for Subversion as a sink
r5513 echo left-2 > b/left-2
hg --cwd b ci -d '2 0' -Amleft-2
hg --cwd b up 0
Peter Arrenbrecht
convert: fix test-convert-svn-* problems with mtime not changing...
r6439 "$TESTDIR/svn-safe-append.py" right-1 b/b
Bryan O'Sullivan
convert: add support for Subversion as a sink
r5513 echo right-1 > b/right-1
hg --cwd b ci -d '3 0' -Amright-1
Peter Arrenbrecht
convert: fix test-convert-svn-* problems with mtime not changing...
r6439 "$TESTDIR/svn-safe-append.py" right-2 b/b
Bryan O'Sullivan
convert: add support for Subversion as a sink
r5513 echo right-2 > b/right-2
hg --cwd b ci -d '4 0' -Amright-2
hg --cwd b up -C 2
hg --cwd b merge
hg --cwd b revert -r 2 b
Stefano Tortarolo
make commit fail when committing unresolved files
r6888 hg resolve -m b
Bryan O'Sullivan
convert: add support for Subversion as a sink
r5513 hg --cwd b ci -d '5 0' -m 'merge'
hg convert -d svn b
echo % expect 4 changes
Patrick Mezard
test-convert-svn-sink: wrap repetitive svn checks in a function
r5808 svnupanddisplay b-hg-wc 0