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

hg init

     3

echo This is file a1 > a

     4

hg add a

     5

hg commit -m "commit #0" -d "1000000 0"

     6

ls

     7

echo This is file b1 > b

     8

hg add b

     9

hg commit -m "commit #1" -d "1000000 0"

    10

hg co 0

    11

# B should disappear

    12

ls