Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-confused-revert.out @ 1641:1ef060ae7966
bash_completion: be more careful about whitespaces
- use awk to parse the output of hg help.
- print one completion candidate per line
- print the debug commands after regular commands
(this eases the shell side of the parsing)
- don't print aliases that are simple abbreviations
(e.g. up/update, id/identify)
author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
---|---|
date | Fri, 27 Jan 2006 12:10:35 +0100 |
parents | 30146be3437c |
children | d436b21b20dc |
rev | line source |
---|---|
1449
30146be3437c
Add test-confused-revert, fix permissions on test-revert
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
1 %%% should show a removed and b added |
30146be3437c
Add test-confused-revert, fix permissions on test-revert
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
2 A b |
30146be3437c
Add test-confused-revert, fix permissions on test-revert
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
3 R a |
30146be3437c
Add test-confused-revert, fix permissions on test-revert
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
4 reverting... |
30146be3437c
Add test-confused-revert, fix permissions on test-revert
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
5 %%% should show b unknown and a back to normal |
30146be3437c
Add test-confused-revert, fix permissions on test-revert
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
6 ? b |
30146be3437c
Add test-confused-revert, fix permissions on test-revert
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
7 merging a |
30146be3437c
Add test-confused-revert, fix permissions on test-revert
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
8 %%% should show foo-b |
30146be3437c
Add test-confused-revert, fix permissions on test-revert
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
9 foo-b |
30146be3437c
Add test-confused-revert, fix permissions on test-revert
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
10 %%% should show a removed and b added |
30146be3437c
Add test-confused-revert, fix permissions on test-revert
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
11 A b |
30146be3437c
Add test-confused-revert, fix permissions on test-revert
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
12 R a |
30146be3437c
Add test-confused-revert, fix permissions on test-revert
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
13 reverting... |
30146be3437c
Add test-confused-revert, fix permissions on test-revert
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
14 %%% should show b unknown and a marked modified (merged) |
30146be3437c
Add test-confused-revert, fix permissions on test-revert
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
15 ? b |
30146be3437c
Add test-confused-revert, fix permissions on test-revert
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
16 %%% should show foo-b |
30146be3437c
Add test-confused-revert, fix permissions on test-revert
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
17 foo-b |