Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-mq-qrename @ 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 | 82c9d1aac308 |
children |
line wrap: on
line source
#!/bin/sh echo "[extensions]" >> $HGRCPATH echo "mq=" >> $HGRCPATH hg init a cd a echo 'base' > base hg ci -Ambase -d '1 0' hg qnew -mmqbase mqbase hg qrename mqbase renamed mkdir .hg/patches/foo hg qrename renamed foo hg qseries ls .hg/patches/foo mkdir .hg/patches/bar hg qrename foo/renamed bar hg qseries ls .hg/patches/bar hg qrename bar/renamed baz hg qseries ls .hg/patches/baz