Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-newbranch @ 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 | bbc97d419b16 |
children |
line wrap: on
line source
#!/bin/sh hg init t cd t hg branches echo foo > a hg add a hg ci -m "initial" -d "1000000 0" hg branch foo hg branch hg ci -m "add branch name" -d "1000000 0" hg branch bar hg ci -m "change branch name" -d "1000000 0" echo % branch shadowing hg branch default hg branch -f default hg ci -m "clear branch name" -d "1000000 0" hg co foo hg branch echo bleah > a hg ci -m "modify a branch" -d "1000000 0" hg merge hg branch hg ci -m "merge" -d "1000000 0" hg log hg branches hg branches -q echo % test for invalid branch cache hg rollback cp .hg/branch.cache .hg/bc-invalid hg log -r foo cp .hg/bc-invalid .hg/branch.cache hg --debug log -r foo rm .hg/branch.cache echo corrupted > .hg/branch.cache hg log -qr foo cat .hg/branch.cache echo % update with no arguments: tipmost revision of the current branch hg up -q -C 0 hg up -q hg id hg up -q 1 hg up -q hg id hg branch foobar hg up echo % fastforward merge hg branch ff echo ff > ff hg ci -Am'fast forward' -d '1000000 0' hg up foo hg merge ff hg branch hg commit -m'Merge ff into foo' -d '1000000 0' hg parents hg manifest exit 0