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

adding da/foo

     2

adding foo

     3

% manifest

     4

200 Script output follows

     5

     6

     7

drwxr-xr-x da

     8

-rw-r--r-- 4 foo

     9

    10

    11

200 Script output follows

    12

    13

    14

-rw-r--r-- 4 foo

    15

    16