tests/test-hgweb.out
author Thomas Arendsen Hein <thomas@intevation.de>
Wed, 06 Jun 2007 19:05:18 +0200
changeset 4510 e0bc2c575044
parent 3936 8eccfce0ab5e
permissions -rw-r--r--
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.

adding da/foo
adding foo
% manifest
200 Script output follows


drwxr-xr-x da
-rw-r--r-- 4 foo


200 Script output follows


-rw-r--r-- 4 foo