Issue a warning if "-r ." is used with two working directory parents. Rationale for not aborting instead: The first parent is usually more important as it is the local branch during a merge and commands like 'hg diff' and 'hg diff -r.' behave still identically (except for the warning of course). Added a test for log -r. with one and two parents.

#!/bin/sh

hg init test
cd test

echo % Without -v
hg serve -a localhost -p 20063 -d --pid-file=hg.pid
cat hg.pid >> "$DAEMON_PIDS"

echo % With -v
hg serve -a localhost -p 20064 -d --pid-file=hg.pid -v
cat hg.pid >> "$DAEMON_PIDS"