# HG changeset patch # User Bryan O'Sullivan # Date 1173242767 28800 # Node ID ceaca14e49f0ad0e4d3b5fed9f503227aa8b5543 # Parent d374685eb7faf097c8e0d7aaede9a601d58a4d9f Add local regexps to ignore bits of output. diff -r d374685eb7fa -r ceaca14e49f0 en/examples/hook.simple --- a/en/examples/hook.simple Tue Mar 06 20:45:50 2007 -0800 +++ b/en/examples/hook.simple Tue Mar 06 20:46:07 2007 -0800 @@ -1,6 +1,7 @@ #!/bin/bash #$ name: init +#$ ignore: [0-9a-f]{40} hg init hook-test cd hook-test @@ -12,8 +13,9 @@ hg commit -m 'testing commit hook' #$ name: ext +#$ ignore: ^date of commit.* -echo 'commit.when = echo "date of commit:"; date' >> .hg/hgrc +echo 'commit.when = echo -n "date of commit: "; date' >> .hg/hgrc echo a >> a hg commit -m 'i have two hooks' diff -r d374685eb7fa -r ceaca14e49f0 en/examples/mq.tutorial --- a/en/examples/mq.tutorial Tue Mar 06 20:45:50 2007 -0800 +++ b/en/examples/mq.tutorial Tue Mar 06 20:46:07 2007 -0800 @@ -22,6 +22,7 @@ ls .hg/patches #$ name: qrefresh +#$ ignore: [0-9a-f]{12} echo 'line 2' >> file1 hg diff diff -r d374685eb7fa -r ceaca14e49f0 en/examples/template.simple --- a/en/examples/template.simple Tue Mar 06 20:45:50 2007 -0800 +++ b/en/examples/template.simple Tue Mar 06 20:46:07 2007 -0800 @@ -1,5 +1,9 @@ #!/bin/bash +# So many different bits of random output, it would be a nightmare to +# ignore each individually. +#$ ignore: .* + hg init myrepo cd myrepo echo hello > hello diff -r d374685eb7fa -r ceaca14e49f0 en/examples/tour --- a/en/examples/tour Tue Mar 06 20:45:50 2007 -0800 +++ b/en/examples/tour Tue Mar 06 20:46:07 2007 -0800 @@ -13,6 +13,7 @@ hg clone http://hg.serpentine.com/tutorial/hello #$ name: ls +#$ ignore: ^drwx.* ls -l ls hello diff -r d374685eb7fa -r ceaca14e49f0 en/examples/tour-merge-conflict --- a/en/examples/tour-merge-conflict Tue Mar 06 20:45:50 2007 -0800 +++ b/en/examples/tour-merge-conflict Tue Mar 06 20:46:07 2007 -0800 @@ -53,6 +53,7 @@ hg pull -u ../scam-son #$ name: merge +#$ ignore: [<>]{7} /tmp/.* export HGMERGE=merge hg merge