Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-convert-hg-source @ 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 | 22ddde515fda |
children |
line wrap: on
line source
#!/bin/sh echo "[extensions]" >> $HGRCPATH echo "hgext.convert=" >> $HGRCPATH hg init orig cd orig echo foo > foo echo bar > bar hg ci -qAm 'add foo bar' -d '0 0' echo >> foo hg ci -m 'change foo' -d '1 0' hg up -qC 0 hg copy --after --force foo bar hg copy foo baz hg ci -m 'make bar and baz copies of foo' -d '2 0' hg merge hg ci -m 'merge local copy' -d '3 0' hg up -C 1 hg merge 2 hg ci -m 'merge remote copy' -d '4 0' cd .. hg convert --datesort orig new 2>&1 | grep -v 'subversion python bindings could not be loaded' cd new hg out ../orig true