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

#!/bin/sh

     2

     3

hg init a

     4

cd a

     5

hg -v log -v

     6

hg -v log -v x

     7

true