tests/test-lock-badness.out
author Thomas Arendsen Hein <thomas@intevation.de>
Wed, 06 Jun 2007 19:05:18 +0200
changeset 4510 e0bc2c575044
parent 2175 b2ae81a7df29
child 6338 0750f11152fe
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 a
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
adding b
pushing to ../a
abort: could not lock repository ../a: Permission denied