Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge-revert2.out @ 1739:57de7e1a81d2
AmbiguousCommand is raised too soon.
Right now, hg raises AmbiguousCommand as soon as it finds two
commands/aliases that start with the substring it's searching for, even
though it may still find a full match later on.
This is a bit hard to hit on purpose, because hg checks the list of
commands in whatever order is returned by table.keys(), which will
change when you add an alias to a command. You should be able to hit it
by adding an alias "u" to the "identify" command - not that that makes a
lot of sense...
| author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
|---|---|
| date | Fri, 17 Feb 2006 17:41:23 -0600 |
| parents | 3b1b44b917f4 |
| children | 7544700fd931 |
line wrap: on
line source
1:f4d7a8c73d23 0:232e179b3f29 f4d7a8c73d23 tip 232e179b3f29 232e179b3f29+ 232e179b3f29 f4d7a8c73d23 tip merge: warning: conflicts during merge merging file1 merging file1 failed! diff -r f4d7a8c73d23 file1 --- a/file1 +++ b/file1 @@ -1,3 +1,7 @@ added file1 added file1 another line of text +<<<<<<< +changed file1 different +======= changed file1 +>>>>>>> M file1 f4d7a8c73d23+ tip f4d7a8c73d23 tip f4d7a8c73d23 tip f4d7a8c73d23 tip