equal
deleted
inserted
replaced
130 expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $ |
130 expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $ |
131 do not process $Id: |
131 do not process $Id: |
132 xxx $ |
132 xxx $ |
133 $Id: c,v 40a904bbbe4c 1970/01/01 00:00:01 user $ |
133 $Id: c,v 40a904bbbe4c 1970/01/01 00:00:01 user $ |
134 tests for different changenodes |
134 tests for different changenodes |
135 % qinit -c |
135 % record |
|
136 diff --git a/a b/a |
|
137 2 hunks, 2 lines changed |
|
138 examine changes to 'a'? [Ynsfdaq?] |
|
139 @@ -1,3 +1,4 @@ |
|
140 expand $Id$ |
|
141 +foo |
|
142 do not process $Id: |
|
143 xxx $ |
|
144 record change 1/2 to 'a'? [Ynsfdaq?] |
|
145 @@ -2,2 +3,3 @@ |
|
146 do not process $Id: |
|
147 xxx $ |
|
148 +bar |
|
149 record change 2/2 to 'a'? [Ynsfdaq?] |
|
150 |
|
151 d17e03c92c97+ tip |
|
152 M a |
|
153 % cat modified file |
|
154 expand $Id: a,v d17e03c92c97 1970/01/01 00:00:01 test $ |
|
155 foo |
|
156 do not process $Id: |
|
157 xxx $ |
|
158 bar |
|
159 diff -r d17e03c92c97 a |
|
160 --- a/a Wed Dec 31 23:59:51 1969 -0000 |
|
161 @@ -2,3 +2,4 @@ |
|
162 foo |
|
163 do not process $Id: |
|
164 xxx $ |
|
165 +bar |
|
166 rolling back to revision 3 (undo commit) |
|
167 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
168 % init --mq |
136 % qimport |
169 % qimport |
137 % qcommit |
170 % commit --mq |
138 % keywords should not be expanded in patch |
171 % keywords should not be expanded in patch |
139 # HG changeset patch |
172 # HG changeset patch |
140 # User User Name <user@example.com> |
173 # User User Name <user@example.com> |
141 # Date 1 0 |
174 # Date 1 0 |
142 # Node ID 40a904bbbe4cd4ab0a1f28411e35db26341a40ad |
175 # Node ID 40a904bbbe4cd4ab0a1f28411e35db26341a40ad |
155 % qgoto - should imply qpush |
188 % qgoto - should imply qpush |
156 applying mqtest.diff |
189 applying mqtest.diff |
157 now at: mqtest.diff |
190 now at: mqtest.diff |
158 % cat |
191 % cat |
159 $Id: c,v 40a904bbbe4c 1970/01/01 00:00:01 user $ |
192 $Id: c,v 40a904bbbe4c 1970/01/01 00:00:01 user $ |
|
193 tests for different changenodes |
|
194 % hg cat |
|
195 $Id: c,v 40a904bbbe4c 1970/01/01 00:00:01 user $ |
|
196 tests for different changenodes |
|
197 % keyword should not be expanded in filelog |
|
198 $Id$ |
160 tests for different changenodes |
199 tests for different changenodes |
161 % qpop and move on |
200 % qpop and move on |
162 popping mqtest.diff |
201 popping mqtest.diff |
163 patch queue now empty |
202 patch queue now empty |
164 % copy |
203 % copy |
206 % custom keyword expansion |
245 % custom keyword expansion |
207 % try with kwdemo |
246 % try with kwdemo |
208 [extensions] |
247 [extensions] |
209 keyword = |
248 keyword = |
210 [keyword] |
249 [keyword] |
211 * = |
250 ** = |
212 b = ignore |
251 b = ignore |
213 demo.txt = |
252 demo.txt = |
214 [keywordmaps] |
253 [keywordmaps] |
215 Xinfo = {author}: {desc} |
254 Xinfo = {author}: {desc} |
216 $Xinfo: test: hg keyword configuration and expansion example $ |
255 $Xinfo: test: hg keyword configuration and expansion example $ |