Mercurial > hg
view tests/test-dispatch.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 | cd5b6a11b607 |
children | 4322e39bd525 |
line wrap: on
line source
adding a # missing arg hg cat: invalid arguments hg cat [OPTION]... FILE... output the current or given revision of files Print the specified files as they were at the given revision. If no revision is given, the parent of the working directory is used, or tip if no revision is checked out. Output may be to a file, in which case the name of the file is given using a format string. The formatting rules are the same as for the export command, with the following additions: %s basename of file being printed %d dirname of file being printed, or '.' if in repository root %p root-relative path name of file being printed options: -o --output print output to file with formatted name -r --rev print the given revision --decode apply any matching decode filter -I --include include names matching the given patterns -X --exclude exclude names matching the given patterns use "hg -v help cat" to show global options % [defaults] a a: No such file in rev 000000000000 % no repo abort: There is no Mercurial repository here (.hg not found)!