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.

     1

To run the tests, do:

     2

     3

cd tests/

     4

python run-tests.py

     5

     6

See http://www.selenic.com/mercurial/wiki/index.cgi/WritingTests for

     7

more information on writing tests.