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

# http://www.selenic.com/mercurial/bts/issue433

     3

     4

hg init a

     5

cd a       

     6

echo a > a 

     7

hg commit -Ama 

     8

     9

hg parents -r 0 doesnotexist

    10

true