Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-diff-ignore-whitespace.out @ 5483:0c43f87baba3 default tip
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.
| author | Maxim Dounin <mdounin@mdounin.ru> |
|---|---|
| date | Sat, 27 Oct 2007 16:27:55 +0400 |
| parents | 372d93f03d3a |
| children |
line wrap: on
line source
adding foo >>> two diffs showing three added lines <<< hg diff diff -r 540c40a65b78 foo --- a/foo +++ b/foo @@ -1,2 +1,5 @@ hello world + hello world + goodbye world + hg diff -b diff -r 540c40a65b78 foo --- a/foo +++ b/foo @@ -1,2 +1,5 @@ hello world + hello world + goodbye world + >>> no diffs <<< hg diff -B hg diff -Bb >>> four diffs showing added space first on the first line <<< hg diff diff -r 540c40a65b78 foo --- a/foo +++ b/foo @@ -1,2 +1,2 @@ hello world -hello world + hello world goodbye world hg diff -b diff -r 540c40a65b78 foo --- a/foo +++ b/foo @@ -1,2 +1,2 @@ hello world -hello world + hello world goodbye world hg diff -B diff -r 540c40a65b78 foo --- a/foo +++ b/foo @@ -1,2 +1,2 @@ hello world -hello world + hello world goodbye world hg diff -Bb 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 <<< hg diff diff -r 540c40a65b78 foo --- a/foo +++ b/foo @@ -1,2 +1,2 @@ hello world -hello world +hello world goodbye world hg diff -B diff -r 540c40a65b78 foo --- a/foo +++ b/foo @@ -1,2 +1,2 @@ hello world -hello world +hello world goodbye world >>> no diffs <<< hg diff -b hg diff -Bb >>> four diffs showing space inserted into "goodbye" <<< hg diff diff -r 540c40a65b78 foo --- a/foo +++ b/foo @@ -1,2 +1,2 @@ hello world hello world -goodbye world +good bye world hg diff -B diff -r 540c40a65b78 foo --- a/foo +++ b/foo @@ -1,2 +1,2 @@ hello world hello world -goodbye world +good bye world hg diff -b diff -r 540c40a65b78 foo --- a/foo +++ b/foo @@ -1,2 +1,2 @@ hello world hello world -goodbye world +good bye world hg diff -Bb 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 <<< hg diff diff -r 540c40a65b78 foo --- a/foo +++ b/foo @@ -1,2 +1,2 @@ hello world hello world -goodbye world +goodbye world hg diff -B diff -r 540c40a65b78 foo --- a/foo +++ b/foo @@ -1,2 +1,2 @@ hello world hello world -goodbye world +goodbye world >>> no diffs <<< hg diff -b hg diff -Bb >>> four diffs showing added blank line w/horizontal space <<< hg diff diff -r 540c40a65b78 foo --- a/foo +++ b/foo @@ -1,2 +1,3 @@ hello world hello world + goodbye world hg diff -B diff -r 540c40a65b78 foo --- a/foo +++ b/foo @@ -1,2 +1,3 @@ hello world hello world + goodbye world hg diff -b diff -r 540c40a65b78 foo --- a/foo +++ b/foo @@ -1,2 +1,3 @@ hello world hello world + goodbye world hg diff -Bb >>> three diffs showing added blank line w/other space <<< hg diff diff -r 540c40a65b78 foo --- a/foo +++ b/foo @@ -1,2 +1,3 @@ hello world -hello world -goodbye world +hello world + +goodbye world hg diff -B diff -r 540c40a65b78 foo --- a/foo +++ b/foo @@ -1,2 +1,3 @@ hello world -hello world -goodbye world +hello world + +goodbye world hg diff -b diff -r 540c40a65b78 foo --- a/foo +++ b/foo @@ -1,2 +1,3 @@ hello world -hello world -goodbye world +hello world + +goodbye world hg diff -Bb >>> four diffs showing changed whitespace <<< hg diff diff -r 540c40a65b78 foo --- a/foo +++ b/foo @@ -1,2 +1,2 @@ hello world -hello world -goodbye world +helloworld +goodbye world hg diff -B diff -r 540c40a65b78 foo --- a/foo +++ b/foo @@ -1,2 +1,2 @@ hello world -hello world -goodbye world +helloworld +goodbye world hg diff -b diff -r 540c40a65b78 foo --- a/foo +++ b/foo @@ -1,2 +1,2 @@ hello world -hello world -goodbye world +helloworld +goodbye world hg diff -Bb diff -r 540c40a65b78 foo --- a/foo +++ b/foo @@ -1,2 +1,2 @@ hello world -hello world -goodbye world +helloworld +goodbye world hg diff -w >>> five diffs showing changed whitespace <<< hg diff diff -r 540c40a65b78 foo --- a/foo +++ b/foo @@ -1,2 +1,5 @@ hello world -hello world -goodbye world +helloworld + + + +goodbye world hg diff -B diff -r 540c40a65b78 foo --- a/foo +++ b/foo @@ -1,2 +1,5 @@ hello world -hello world -goodbye world +helloworld + + + +goodbye world hg diff -b diff -r 540c40a65b78 foo --- a/foo +++ b/foo @@ -1,2 +1,5 @@ hello world -hello world -goodbye world +helloworld + + + +goodbye world hg diff -Bb diff -r 540c40a65b78 foo --- a/foo +++ b/foo @@ -1,2 +1,5 @@ hello world -hello world -goodbye world +helloworld + + + +goodbye world hg diff -w diff -r 540c40a65b78 foo --- a/foo +++ b/foo @@ -1,2 +1,5 @@ hello world -hello world -goodbye world +helloworld + + + +goodbye world hg diff -wB