Mercurial > hg
view tests/test-profile.t @ 13531:67fbe566eff1 stable
subrepo: handle svn tracked/unknown directory collisions
This happens more often than expected. Say you have an svn subrepository with
python code. Python would have generated unknown .pyc files. Now, you rebase
this setup on a revision where a directory containing python code does not
exist. Subversion is first asked to remove this directory when updating, but
will not because it contains untracked items. Then it will have to bring back
the directory after the merge but will fail because it now collides with an
untracked directory.
Using --force is not very elegant but it is much simpler than rewriting our own
purge command for subversion.
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Fri, 04 Mar 2011 14:00:49 +0100 |
parents | bb665db49e32 |
children | bb91c602d4ad |
line wrap: on
line source
test --time $ hg --time help -q help 2>&1 | grep Time > /dev/null $ hg init a $ cd a test --profile $ if "$TESTDIR/hghave" -q lsprof; then > hg --profile st 2>../out || echo --profile failed > grep CallCount < ../out > /dev/null || echo wrong --profile > > hg --profile --config profiling.output=../out st 2>&1 \ > || echo --profile + output to file failed > grep CallCount < ../out > /dev/null \ > || echo wrong --profile output when saving to a file > > hg --profile --config profiling.format=text st 2>&1 \ > | grep CallCount > /dev/null || echo --profile format=text failed > > echo "[profiling]" >> $HGRCPATH > echo "format=kcachegrind" >> $HGRCPATH > > hg --profile st 2>../out || echo --profile format=kcachegrind failed > grep 'events: Ticks' < ../out > /dev/null || echo --profile output is wrong > > hg --profile --config profiling.output=../out st 2>&1 \ > || echo --profile format=kcachegrind + output to file failed > grep 'events: Ticks' < ../out > /dev/null \ > || echo --profile output is wrong > fi