view tests/test-bookmarks-rebase.out @ 10135:9a4034b630c4 stable

patch: better handling of sequence of offset patch hunks (issue1941)

The built-in patch implementation applied the hunks to the wrong lines of the
file if the file in the repo has been modified to skew the patch line numbers
and the file contains repetitive sequences of lines.

% initialize repository
adding a
adding b
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
adding c
created new head
adding d
% bookmark list
 * two                       3:2ae46b1d99a7
   one                       1:925d80f479bb
% rebase
saving bundle to 
adding branch
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (-1 heads)
rebase completed
changeset:   3:9163974d1cb5
tag:         tip
tag:         two
tag:         one
parent:      1:925d80f479bb
parent:      2:db815d6d32e6
user:        test
date:        Thu Jan 01 00:00:00 1970 +0000
summary:     3

changeset:   2:db815d6d32e6
parent:      0:f7b1eb17ad24
user:        test
date:        Thu Jan 01 00:00:00 1970 +0000
summary:     2

changeset:   1:925d80f479bb
user:        test
date:        Thu Jan 01 00:00:00 1970 +0000
summary:     1

changeset:   0:f7b1eb17ad24
user:        test
date:        Thu Jan 01 00:00:00 1970 +0000
summary:     0