Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-bisect @ 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 | 61fcd9fac434 |
children |
line wrap: on
line source
#!/bin/sh set -e echo "[extensions]" >> $HGRCPATH echo "hbisect=" >> $HGRCPATH echo % init hg init echo % committing changes count=0 echo > a while test $count -lt 32 ; do echo 'a' >> a test $count -eq 0 && hg add hg ci -m "msg $count" -d "$count 0" echo % committed changeset $count count=`expr $count + 1` done echo % log hg log echo % hg up -C hg up -C echo % bisect test hg bisect init hg bisect bad hg bisect good 1 hg bisect good hg bisect good hg bisect good hg bisect bad hg bisect good