Mercurial > hg > mercurial-crew-with-dirclash

annotate tests/test-empty @ 5483:0c43f87baba3 default tip

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 2b77ea66fe70
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1338
2b77ea66fe70 Add empty repo test
mpm@selenic.com
parents:
diff changeset
1 #!/bin/sh
2b77ea66fe70 Add empty repo test
mpm@selenic.com
parents:
diff changeset
2
2b77ea66fe70 Add empty repo test
mpm@selenic.com
parents:
diff changeset
3 hg init
2b77ea66fe70 Add empty repo test
mpm@selenic.com
parents:
diff changeset
4 hg log
2b77ea66fe70 Add empty repo test
mpm@selenic.com
parents:
diff changeset
5 hg grep wah
2b77ea66fe70 Add empty repo test
mpm@selenic.com
parents:
diff changeset
6 hg manifest
2b77ea66fe70 Add empty repo test
mpm@selenic.com
parents:
diff changeset
7 hg verify