Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-bad-extension.out @ 3387:ba7c74081861
merge: update dirstate correctly for non-branchmerge updates
- we don't actually need the context in recordupdates
- use -1 for filesize to force check on normal update
- only record copy for branchmerges
- forget moved files on update
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Fri, 13 Oct 2006 17:58:04 -0500 |
parents | 01454af644b8 |
children | 96e21337dc03 |
rev | line source |
---|---|
3011
01454af644b8
load extensions only after the ui object has been completely initialized
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
1 *** failed to import extension badext: invalid syntax (badext.py, line 1) |
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 |