equal
deleted
inserted
replaced
21 $ echo "[extensions]" >> $HGRCPATH |
21 $ echo "[extensions]" >> $HGRCPATH |
22 $ echo "mq=" >> $HGRCPATH |
22 $ echo "mq=" >> $HGRCPATH |
23 |
23 |
24 $ hg init normal |
24 $ hg init normal |
25 $ cd normal |
25 $ cd normal |
26 $ $PYTHON ../writelines.py b 10 'a\n' |
26 $ "$PYTHON" ../writelines.py b 10 'a\n' |
27 $ hg ci -Am addb |
27 $ hg ci -Am addb |
28 adding b |
28 adding b |
29 $ echo a > a |
29 $ echo a > a |
30 $ $PYTHON ../writelines.py b 2 'b\n' 10 'a\n' 2 'c\n' |
30 $ "$PYTHON" ../writelines.py b 2 'b\n' 10 'a\n' 2 'c\n' |
31 $ echo c > c |
31 $ echo c > c |
32 $ hg add a c |
32 $ hg add a c |
33 $ hg qnew -f changeb |
33 $ hg qnew -f changeb |
34 $ hg qpop |
34 $ hg qpop |
35 popping changeb |
35 popping changeb |
80 popping changeb |
80 popping changeb |
81 patch queue now empty |
81 patch queue now empty |
82 $ hg up -qC 0 |
82 $ hg up -qC 0 |
83 $ echo a > a |
83 $ echo a > a |
84 $ hg mv b bb |
84 $ hg mv b bb |
85 $ $PYTHON ../writelines.py bb 2 'b\n' 10 'a\n' 2 'c\n' |
85 $ "$PYTHON" ../writelines.py bb 2 'b\n' 10 'a\n' 2 'c\n' |
86 $ echo c > c |
86 $ echo c > c |
87 $ hg add a c |
87 $ hg add a c |
88 $ hg qnew changebb |
88 $ hg qnew changebb |
89 $ hg qpop |
89 $ hg qpop |
90 popping changebb |
90 popping changebb |
127 $ echo "[diff]" >> $HGRCPATH |
127 $ echo "[diff]" >> $HGRCPATH |
128 $ echo "git=1" >> $HGRCPATH |
128 $ echo "git=1" >> $HGRCPATH |
129 |
129 |
130 $ hg init git |
130 $ hg init git |
131 $ cd git |
131 $ cd git |
132 $ $PYTHON ../writelines.py b 1 '\x00' |
132 $ "$PYTHON" ../writelines.py b 1 '\x00' |
133 $ hg ci -Am addb |
133 $ hg ci -Am addb |
134 adding b |
134 adding b |
135 $ echo a > a |
135 $ echo a > a |
136 $ $PYTHON ../writelines.py b 1 '\x01' 1 '\x00' |
136 $ "$PYTHON" ../writelines.py b 1 '\x01' 1 '\x00' |
137 $ echo c > c |
137 $ echo c > c |
138 $ hg add a c |
138 $ hg add a c |
139 $ hg qnew -f changeb |
139 $ hg qnew -f changeb |
140 $ hg qpop |
140 $ hg qpop |
141 popping changeb |
141 popping changeb |