Mercurial Mercurial > hg > mercurial-crew-with-dirclash / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-bad-extension.out
author Maxim Dounin <mdounin@mdounin.ru>
Sat, 27 Oct 2007 16:27:55 +0400
changeset 5483 0c43f87baba3
parent 5032 6dbd40b6307c
permissions -rw-r--r--
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.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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















mercurial-crew-with-dirclash