Mercurial > hg
view tests/test-static-http.out @ 9827:4fe9ca519637
mdiff: fix diff -b/B/w on mixed whitespace hunks (issue127)
Previous code was computing hunks then checking if these hunks could be ignored
when taking whitespace/blank-lines options in accounts. This approach is simple
but fails with hunks containing both whitespace and non-whitespace changes, the
whole hunk is emitted while it can be mostly made of whitespace. The new
version normalize the whitespaces before hunk generation, and test for
blank-lines afterwards.
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Wed, 11 Nov 2009 18:31:42 +0100 |
parents | a3d73b3e1f8a |
children | ace3cf2bc991 |
line wrap: on
line source
abort: error: Connection refused 255 copy: No such file or directory changeset: 0:53e17d176ae6 tag: tip user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: test requesting all changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved checking changesets checking manifests crosschecking files in changesets and manifests checking files 1 files, 1 changesets, 1 total revisions foo adding quux changegroup hook: HG_NODE=34401e0e9971e9720b613d9089ffa9a6eefb3d2d HG_SOURCE=pull HG_URL=http://localhost/remote pulling from static-http://localhost/remote searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files (run 'hg update' to get a working copy) % trying to push 1 files updated, 0 files merged, 0 files removed, 0 files unresolved abort: cannot lock static-http repository pushing to static-http://localhost/remote % test with "/" URI (issue 747) requesting all changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved checking changesets checking manifests crosschecking files in changesets and manifests checking files 1 files, 1 changesets, 1 total revisions a default = static-http://localhost/ % test with empty repo (issue965) no changes found updating to branch default 0 files updated, 0 files merged, 0 files removed, 0 files unresolved checking changesets checking manifests crosschecking files in changesets and manifests checking files 0 files, 0 changesets, 0 total revisions default = static-http://localhost/remotempty % test with non-repo abort: 'http://localhost/notarepo' does not appear to be an hg repository!