Mercurial > hg
view tests/test-churn.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 | 7d56b6ffef72 |
children | 717c35d55fb3 |
line wrap: on
line source
% create test repository adding a adding b adding c % churn separate directories user1 1 *************************************************************** % churn all user3 3 *************************************************************** user1 3 *************************************************************** user2 2 ****************************************** % churn up to rev 2 user2 2 *************************************************************** user1 1 ******************************** % churn with aliases alias3 3 ************************************************************** alias1 3 ************************************************************** user2 2 ***************************************** % churn with .hgchurn alias3 3 ************************************************************** alias1 3 ************************************************************** user2 2 ***************************************** % churn with column specifier user3 3 *********************** user1 3 *********************** user2 2 *************** % churn by hour 06 1 ***************** 09 2 ********************************* 12 4 ****************************************************************** 13 1 ***************** % churn with separated added/removed lines user1 +3/-1 +++++++++++++++++++++++++++++++++++++++++-------------- user3 +3/-0 +++++++++++++++++++++++++++++++++++++++++ user2 +2/-0 +++++++++++++++++++++++++++ % changeset number churn user1 4 *************************************************************** user3 3 *********************************************** user2 2 ******************************** adding foo test 0