Mercurial > hg
view tests/test-mq-qdiff @ 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 | 24bc6e414610 |
children | 99d285ac5da4 |
line wrap: on
line source
#!/bin/sh echo "[extensions]" >> $HGRCPATH echo "mq=" >> $HGRCPATH echo % init hg init a cd a echo % commit echo 'base' > base hg ci -Ambase -d '1 0' echo % qnew mqbase hg qnew -mmqbase mqbase echo % qrefresh echo 'patched' > base hg qrefresh echo % qdiff hg qdiff | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \ -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/" echo % qdiff dirname hg qdiff . | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \ -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/" echo % qdiff filename hg qdiff --nodates base echo % revert hg revert -a echo % qpop hg qpop echo % qdelete mqbase hg qdelete mqbase echo % commit 2 printf '1\n2\n3\n4\nhello world\ngoodbye world\n7\n8\n9\n' > lines hg ci -Amlines -d '2 0' echo % qnew 2 hg qnew -mmqbase2 mqbase2 printf '\n\n1\n2\n3\n4\nhello world\n goodbye world\n7\n8\n9\n' > lines echo % qdiff -U 1 hg qdiff --nodates -U 1 echo % qdiff -b hg qdiff --nodates -b echo % qdiff -U 1 -B hg qdiff --nodates -U 1 -B echo % qdiff -w hg qdiff --nodates -w echo % qdiff --reverse hg qdiff --nodates --reverse