Mercurial > hg > mercurial-crew-with-dirclash

annotate tests/test-bad-extension.out @ 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 6dbd40b6307c
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
4139
efe6f92c0847 test-bad-extension: avoid printing the file name
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 3990
diff changeset
1 *** failed to import extension badext: bit bucket overflow
3011
01454af644b8 load extensions only after the ui object has been completely initialized
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
2 hg help [COMMAND]
01454af644b8 load extensions only after the ui object has been completely initialized
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
3
01454af644b8 load extensions only after the ui object has been completely initialized
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
4 show help for a command, extension, or list of commands