view tests/test-bookmarks-strip.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 9737041646bc
children 4bb4895e1693
line wrap: on
line source

% add file
adding qqq.txt
% commit first revision
% set bookmark
% commit second revision
% set bookmark
% update to -2
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
% commit new head
created new head
% bookmarks updated?
   test                      1:16b24da7e457
   test2                     1:16b24da7e457
% strip to revision 1
saving bundle to 
saving bundle to 
adding branch
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
% list bookmarks
 * test                      1:9f1b7e78eff8
 * test2                     1:9f1b7e78eff8