Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-diff-ignore-whitespace.out @ 2696:be273f6074de
mq: patch naming shortcuts
This adds some more options to the mq lookup routine. It allows
you to use shortcuts in naming patches to push or pop. You
can now use:
1) a full patch name
2) a number to indicate an offset in the series file
3) a unique substring of the patch name
4) patchname[-+]num to indicate an offset from a given patch.
For case #3 substrings are allowed. qtip and qbase are aliases for
the top and bottom of the applied patch queue, unless they are already
in the series file as patch names.
| author | Chris Mason <mason@suse.com> |
|---|---|
| date | Thu, 27 Jul 2006 09:27:35 -0700 |
| parents | bdf9d809467c |
| children | 372d93f03d3a |
line wrap: on
line source
adding foo >>> two diffs showing three added lines <<< diff -r 540c40a65b78 foo --- a/foo +++ b/foo @@ -1,2 +1,5 @@ hello world + hello world + goodbye world + diff -r 540c40a65b78 foo --- a/foo +++ b/foo @@ -1,2 +1,5 @@ hello world + hello world + goodbye world + >>> no diffs <<< >>> four diffs showing added space first on the first line <<< diff -r 540c40a65b78 foo --- a/foo +++ b/foo @@ -1,2 +1,2 @@ hello world -hello world + hello world goodbye world diff -r 540c40a65b78 foo --- a/foo +++ b/foo @@ -1,2 +1,2 @@ hello world -hello world + hello world goodbye world diff -r 540c40a65b78 foo --- a/foo +++ b/foo @@ -1,2 +1,2 @@ hello world -hello world + hello world goodbye world diff -r 540c40a65b78 foo --- a/foo +++ b/foo @@ -1,2 +1,2 @@ hello world -hello world + hello world goodbye world >>> two diffs showing space appended to the first line <<< diff -r 540c40a65b78 foo --- a/foo +++ b/foo @@ -1,2 +1,2 @@ hello world -hello world +hello world goodbye world diff -r 540c40a65b78 foo --- a/foo +++ b/foo @@ -1,2 +1,2 @@ hello world -hello world +hello world goodbye world >>> no diffs <<< >>> four diffs showing space inserted into "goodbye" <<< diff -r 540c40a65b78 foo --- a/foo +++ b/foo @@ -1,2 +1,2 @@ hello world hello world -goodbye world +good bye world diff -r 540c40a65b78 foo --- a/foo +++ b/foo @@ -1,2 +1,2 @@ hello world hello world -goodbye world +good bye world diff -r 540c40a65b78 foo --- a/foo +++ b/foo @@ -1,2 +1,2 @@ hello world hello world -goodbye world +good bye world diff -r 540c40a65b78 foo --- a/foo +++ b/foo @@ -1,2 +1,2 @@ hello world hello world -goodbye world +good bye world >>> two diffs showing changed whitespace amount in the last line <<< diff -r 540c40a65b78 foo --- a/foo +++ b/foo @@ -1,2 +1,2 @@ hello world hello world -goodbye world +goodbye world diff -r 540c40a65b78 foo --- a/foo +++ b/foo @@ -1,2 +1,2 @@ hello world hello world -goodbye world +goodbye world >>> no diffs <<< >>> four diffs showing added blank line w/horizontal space <<< diff -r 540c40a65b78 foo --- a/foo +++ b/foo @@ -1,2 +1,3 @@ hello world hello world + goodbye world diff -r 540c40a65b78 foo --- a/foo +++ b/foo @@ -1,2 +1,3 @@ hello world hello world + goodbye world diff -r 540c40a65b78 foo --- a/foo +++ b/foo @@ -1,2 +1,3 @@ hello world hello world + goodbye world diff -r 540c40a65b78 foo --- a/foo +++ b/foo @@ -1,2 +1,3 @@ hello world hello world + goodbye world