view tests/test-issue842 @ 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 cb93eee1fbcd
children
line wrap: on
line source

#!/bin/sh

hg init test
cd test
echo foo > a
hg ci -Ama

hg up -r0000
echo bar > a
echo % should issue warning
hg ci -Amb

hg up -r0000
echo stuffy > a
echo % should not issue warning
hg ci -q -Amc

hg up -r0000
echo crap > a
hg branch testing
echo % should not issue warning
hg ci -q -Amd