Show More
@@ -3,6 +3,7 b'' | |||||
3 | cat <<EOF >> $HGRCPATH |
|
3 | cat <<EOF >> $HGRCPATH | |
4 | [extensions] |
|
4 | [extensions] | |
5 | hgext.keyword = |
|
5 | hgext.keyword = | |
|
6 | hgext.mq = | |||
6 | [keyword] |
|
7 | [keyword] | |
7 | * = |
|
8 | * = | |
8 | b = ignore |
|
9 | b = ignore | |
@@ -88,9 +89,19 b' echo % force expansion' | |||||
88 | hg -v kwexpand |
|
89 | hg -v kwexpand | |
89 | echo % compare changenodes in a c |
|
90 | echo % compare changenodes in a c | |
90 | cat a c |
|
91 | cat a c | |
91 | echo % rollback and remove c |
|
92 | ||
92 | hg rollback |
|
93 | echo % qimport | |
93 | rm c |
|
94 | hg qimport -r tip -n mqtest.diff | |
|
95 | echo % keywords should not be expanded in patch | |||
|
96 | cat .hg/patches/mqtest.diff | |||
|
97 | echo % qpop | |||
|
98 | hg qpop | |||
|
99 | echo % qgoto - should imply qpush | |||
|
100 | hg qgoto mqtest.diff | |||
|
101 | echo % cat | |||
|
102 | cat c | |||
|
103 | echo % qpop and move on | |||
|
104 | hg qpop | |||
94 |
|
105 | |||
95 | echo % copy |
|
106 | echo % copy | |
96 | hg cp a c |
|
107 | hg cp a c |
@@ -162,8 +162,31 b' do not process $Id:' | |||||
162 | xxx $ |
|
162 | xxx $ | |
163 | $Id: c,v ba4426d1938e 1970/01/01 00:00:01 user $ |
|
163 | $Id: c,v ba4426d1938e 1970/01/01 00:00:01 user $ | |
164 | tests for different changenodes |
|
164 | tests for different changenodes | |
165 | % rollback and remove c |
|
165 | % qimport | |
166 | rolling back last transaction |
|
166 | % keywords should not be expanded in patch | |
|
167 | # HG changeset patch | |||
|
168 | # User User Name <user@example.com> | |||
|
169 | # Date 1 0 | |||
|
170 | # Node ID ba4426d1938ec9673e03ab274d88c44e24618f7f | |||
|
171 | # Parent f782df5f9602483b4e51c31a12315f353bba380c | |||
|
172 | cndiff | |||
|
173 | ||||
|
174 | diff -r f782df5f9602 -r ba4426d1938e c | |||
|
175 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 | |||
|
176 | +++ b/c Thu Jan 01 00:00:01 1970 +0000 | |||
|
177 | @@ -0,0 +1,2 @@ | |||
|
178 | +$Id$ | |||
|
179 | +tests for different changenodes | |||
|
180 | % qpop | |||
|
181 | Patch queue now empty | |||
|
182 | % qgoto - should imply qpush | |||
|
183 | applying mqtest.diff | |||
|
184 | Now at: mqtest.diff | |||
|
185 | % cat | |||
|
186 | $Id: c,v ba4426d1938e 1970/01/01 00:00:01 user $ | |||
|
187 | tests for different changenodes | |||
|
188 | % qpop and move on | |||
|
189 | Patch queue now empty | |||
167 | % copy |
|
190 | % copy | |
168 | % kwfiles added |
|
191 | % kwfiles added | |
169 | a |
|
192 | a |
General Comments 0
You need to be logged in to leave comments.
Login now