Mercurial > hg
view tests/test-serve @ 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 | fdb0983ad395 |
children |
line wrap: on
line source
#!/bin/sh hgserve() { hg serve -a localhost -d --pid-file=hg.pid -E errors.log -v $@ \ | sed -e "s/:$HGPORT1\\([^0-9]\\)/:HGPORT1\1/g" \ -e "s/:$HGPORT2\\([^0-9]\\)/:HGPORT2\1/g" \ -e 's/http:\/\/[^/]*\//http:\/\/localhost\//' cat hg.pid >> "$DAEMON_PIDS" echo % errors cat errors.log sleep 1 if [ "$KILLQUIETLY" = "Y" ]; then kill `cat hg.pid` 2>/dev/null else kill `cat hg.pid` fi sleep 1 } hg init test cd test echo '[web]' > .hg/hgrc echo 'accesslog = access.log' >> .hg/hgrc echo "port = $HGPORT1" >> .hg/hgrc echo % Without -v hg serve -a localhost -p $HGPORT -d --pid-file=hg.pid -E errors.log cat hg.pid >> "$DAEMON_PIDS" if [ -f access.log ]; then echo 'access log created - .hg/hgrc respected' fi echo % errors cat errors.log echo % With -v hgserve echo % With -v and -p HGPORT2 hgserve -p "$HGPORT2" echo '% With -v and -p daytime (should fail because low port)' KILLQUIETLY=Y hgserve -p daytime KILLQUIETLY=N echo % With --prefix foo hgserve --prefix foo echo % With --prefix /foo hgserve --prefix /foo echo % With --prefix foo/ hgserve --prefix foo/ echo % With --prefix /foo/ hgserve --prefix /foo/