Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-abort-checkin @ 4510:e0bc2c575044
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.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Wed, 06 Jun 2007 19:05:18 +0200 |
parents | 193e0f8d9a47 |
children |
line wrap: on
line source
#!/bin/sh cat > abortcommit.py <<EOF from mercurial import util def hook(**args): raise util.Abort("no commits allowed") def reposetup(ui, repo): repo.ui.setconfig("hooks", "pretxncommit.nocommits", hook) EOF abspath=`pwd`/abortcommit.py echo "[extensions]" >> $HGRCPATH echo "mq=" >> $HGRCPATH echo "abortcommit = $abspath" >> $HGRCPATH hg init foo cd foo echo foo > foo hg add foo # mq may keep a reference to the repository so __del__ will not be called # and .hg/journal.dirstate will not be deleted: hg ci -m foo hg ci -m foo exit 0