Show More
@@ -5,6 +5,16 b' echo "graphlog=" >> $HGRCPATH' | |||||
5 | echo "rebase=" >> $HGRCPATH |
|
5 | echo "rebase=" >> $HGRCPATH | |
6 | echo "mq=" >> $HGRCPATH |
|
6 | echo "mq=" >> $HGRCPATH | |
7 |
|
7 | |||
|
8 | filterpatch() | |||
|
9 | { | |||
|
10 | sed -e "s/^\(# Date\).*/\1/" \ | |||
|
11 | -e "s/^\(# Node ID\).*/\1/" \ | |||
|
12 | -e "s/^\(# Parent\).*/\1/" \ | |||
|
13 | -e "s/^\(diff -r \)\([a-f0-9]* \)\(-r \)\([a-f0-9]* \)/\1x \3y /" \ | |||
|
14 | -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/" \ | |||
|
15 | -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" | |||
|
16 | } | |||
|
17 | ||||
8 | hg init a |
|
18 | hg init a | |
9 | cd a |
|
19 | cd a | |
10 | hg qinit -c # This must work even with a managed mq queue |
|
20 | hg qinit -c # This must work even with a managed mq queue | |
@@ -54,9 +64,7 b' hg up qbase' | |||||
54 | echo '% f correctly reflects the merge result' |
|
64 | echo '% f correctly reflects the merge result' | |
55 | cat f |
|
65 | cat f | |
56 | echo '% And the patch is correct' |
|
66 | echo '% And the patch is correct' | |
57 | cat .hg/patches/f.patch | sed -e "s/^\(# \(Date\|Node ID\|Parent\)\).*/\1/" \ |
|
67 | cat .hg/patches/f.patch | filterpatch | |
58 | -e "s/^\(diff -r \)\([a-f0-9]* \)\(-r \)\([a-f0-9]* \)/\1x \3y /" \ |
|
|||
59 | -e "s/\(\(---\|+++\) [a-zA-Z0-9_/.-]*\).*/\1/" |
|
|||
60 |
|
68 | |||
61 | echo |
|
69 | echo | |
62 | echo '% Update to qtip' |
|
70 | echo '% Update to qtip' | |
@@ -64,6 +72,5 b' hg up qtip' | |||||
64 | echo '% f correctly reflects the merge result' |
|
72 | echo '% f correctly reflects the merge result' | |
65 | cat f |
|
73 | cat f | |
66 | echo '% And the patch is correct' |
|
74 | echo '% And the patch is correct' | |
67 | cat .hg/patches/f2.patch | sed -e "s/^\(# \(Date\|Node ID\|Parent\)\).*/\1/" \ |
|
75 | cat .hg/patches/f2.patch | filterpatch | |
68 | -e "s/^\(diff -r \)\([a-f0-9]* \)\(-r \)\([a-f0-9]* \)/\1x \3y /" \ |
|
76 | ||
69 | -e "s/\(\(---\|+++\) [a-zA-Z0-9_/.-]*\).*/\1/" |
|
General Comments 0
You need to be logged in to leave comments.
Login now