tests/test-abort-checkin.out
author Thomas Arendsen Hein <thomas@intevation.de>
Wed, 06 Jun 2007 19:05:18 +0200
changeset 4510 e0bc2c575044
parent 4140 193e0f8d9a47
child 4960 5c5d23d93447
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.

error: pretxncommit.nocommits hook failed: no commits allowed
abort: no commits allowed
transaction abort!
rollback completed
error: pretxncommit.nocommits hook failed: no commits allowed
abort: no commits allowed
transaction abort!
rollback completed