Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-abort-checkin @ 5483:0c43f87baba3 default tip
Fix file-changed-to-dir and dir-to-file commits (issue660).
Allow adding to dirstate files that clash with previously existing
but marked for removal. Protect from reintroducing clashes by revert.
This change doesn't address related issues with update. Current
workaround is to do "clean" update by manually removing conflicting
files/dirs from working directory.
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Sat, 27 Oct 2007 16:27:55 +0400 |
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