Mercurial > hg
view tests/test-convert-bzr-directories.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.
| author | Greg Onufer <gonufer@jazzhaiku.com> |
|---|---|
| date | Wed, 09 Dec 2009 16:56:00 -0800 |
| parents | 209ef5f3534c |
| children |
line wrap: on
line source
% empty directory initializing destination source-hg repository scanning source... sorting... converting... 2 Initial add 1 Empty directory added 0 Added file into directory % manifest of 1 644 a % manifest of tip 644 a 644 empty/something % directory renames tpyo => typo initializing destination source-hg repository scanning source... sorting... converting... 1 Added directory 0 Oops, typo % manifest of 0 644 tpyo/something % manifest of tip 644 typo/something % nested directory renames firstlevel/secondlevel => secondlevel initializing destination source-hg repository scanning source... sorting... converting... 1 Added nested directories 0 Moved secondlevel one level up % manifest of tip 644 secondlevel/file 644 secondlevel/thirdlevel/stuff % directory remove initializing destination source-hg repository scanning source... sorting... converting... 1 Added directory 0 Removed directory % manifest of 0 644 src/sourcecode % manifest of tip % directory replace first/file => second/file first => third initializing destination source-hg repository scanning source... sorting... converting... 1 Initial layout 0 Some conflicting moves % manifest of tip 644 second/file 644 second/something 644 third/dummy