Mercurial > hg
view tests/test-churn @ 8810:ac92775b3b80
Add patch.eol to ignore EOLs when patching (issue1019)
The intent is to fix many issues involving patching when win32ext is enabled.
With win32ext, the working directory and repository files EOLs are not the same
which means that patches made on a non-win32ext host do not apply cleanly
because of EOLs discrepancies. A theorically correct approach would be
transform either the patched file or the patch content with the
encoding/decoding filters used by win32ext. This solution is tricky to
implement and invasive, instead we prefer to address the win32ext case, by
offering a way to ignore input EOLs when patching and rewriting them when
saving the patched result.
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Mon, 15 Jun 2009 00:03:26 +0200 |
parents | f108e89400d8 |
children | d7b6429c5ad4 f7968bba2307 |
line wrap: on
line source
#!/bin/sh echo "[extensions]" >> $HGRCPATH echo "churn=" >> $HGRCPATH COLUMNS=80; export COLUMNS echo % create test repository hg init repo cd repo echo a > a hg ci -Am adda -u user1 -d 6:00 echo b >> a echo b > b hg ci -m changeba -u user2 -d 9:00 a hg ci -Am addb -u user2 -d 9:30 echo c >> a echo c >> b echo c > c hg ci -m changeca -u user3 -d 12:00 a hg ci -m changecb -u user3 -d 12:15 b hg ci -Am addc -u user3 -d 12:30 mkdir -p d/e echo abc > d/e/f1.txt hg ci -Am "add d/e/f1.txt" -u user1 -d 12:45 d/e/f1.txt mkdir -p d/g echo def > d/g/f2.txt hg ci -Am "add d/g/f2.txt" -u user1 -d 13:00 d/g/f2.txt echo % churn separate directories hg churn d/e echo % churn all hg churn echo % churn up to rev 2 hg churn -r :2 echo % churn with aliases cat > ../aliases <<EOF user1 alias1 user3 alias3 EOF hg churn --aliases ../aliases echo % churn with .hgchurn mv ../aliases .hgchurn hg churn rm .hgchurn echo % churn with column specifier COLUMNS=40 hg churn echo % churn by hour hg churn -f '%H' -s