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.
$ "$TESTDIR/hghave" inotify || exit 80
$ echo "[extensions]" >> $HGRCPATH
$ echo "inotify=" >> $HGRCPATH
$ p="xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
$ hg init $p
$ cd $p
fail
$ ln -sf doesnotexist .hg/inotify.sock
$ hg st
abort: inotify-server: cannot start: .hg/inotify.sock is a broken symlink
inotify-client: could not start inotify server: child process failed to start
$ hg inserve
abort: inotify-server: cannot start: .hg/inotify.sock is a broken symlink
[255]
$ rm .hg/inotify.sock
inserve
$ hg inserve -d --pid-file=hg.pid
$ cat hg.pid >> "$DAEMON_PIDS"
status
$ hg status
? hg.pid
if we try to start twice the server, make sure we get a correct error
$ hg inserve -d --pid-file=hg2.pid
abort: inotify-server: cannot start: socket is already bound
abort: child process failed to start
[255]
$ kill `cat hg.pid`