Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-no-symlinks @ 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 | fc6106267198 |
children |
line wrap: on
line source
#!/bin/sh "$TESTDIR/hghave" no-symlink || exit 80 # The following script was used to create the bundle: # # hg init symlinks # cd symlinks # echo a > a # mkdir d # echo b > d/b # ln -s a a.lnk # ln -s d/b d/b.lnk # hg ci -Am t # hg bundle --base null ../test-no-symlinks.hg # Extract a symlink on a platform not supporting them echo % unbundle hg init t cd t hg pull -q "$TESTDIR/test-no-symlinks.hg" hg update cat a.lnk && echo cat d/b.lnk && echo # Copy a symlink and move another echo % move and copy hg copy a.lnk d/a2.lnk hg mv d/b.lnk b2.lnk hg ci -Am copy cat d/a2.lnk && echo cat b2.lnk && echo # Bundle and extract again echo % bundle hg bundle --base null ../symlinks.hg cd .. hg init t2 cd t2 hg pull ../symlinks.hg hg update cat a.lnk && echo cat d/a2.lnk && echo cat b2.lnk && echo