equal
deleted
inserted
replaced
115 % commit |
115 % commit |
116 a |
116 a |
117 b |
117 b |
118 overwriting a expanding keywords |
118 overwriting a expanding keywords |
119 running hook commit.test: cp a hooktest |
119 running hook commit.test: cp a hooktest |
120 committed changeset ef63ca68695b |
|
121 % status |
120 % status |
122 ? hooktest |
121 ? hooktest |
123 % identify |
122 % identify |
124 ef63ca68695b |
123 ef63ca68695b |
125 % cat |
124 % cat |
222 c |
221 c |
223 % commit |
222 % commit |
224 c |
223 c |
225 c: copy a:0045e12f6c5791aac80ca6cbfd97709a88307292 |
224 c: copy a:0045e12f6c5791aac80ca6cbfd97709a88307292 |
226 overwriting c expanding keywords |
225 overwriting c expanding keywords |
227 committed changeset e22d299ac0c2 |
|
228 % cat a c |
226 % cat a c |
229 expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $ |
227 expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $ |
230 do not process $Id: |
228 do not process $Id: |
231 xxx $ |
229 xxx $ |
232 expand $Id: c,v e22d299ac0c2 1970/01/01 00:00:01 user $ |
230 expand $Id: c,v e22d299ac0c2 1970/01/01 00:00:01 user $ |
280 M a |
278 M a |
281 ? log |
279 ? log |
282 % commit |
280 % commit |
283 a |
281 a |
284 overwriting a expanding keywords |
282 overwriting a expanding keywords |
285 committed changeset bb948857c743 |
|
286 % status |
283 % status |
287 % verify |
284 % verify |
288 checking changesets |
285 checking changesets |
289 checking manifests |
286 checking manifests |
290 crosschecking files in changesets and manifests |
287 crosschecking files in changesets and manifests |
307 1: expand $Id$ |
304 1: expand $Id$ |
308 1: do not process $Id: |
305 1: do not process $Id: |
309 1: xxx $ |
306 1: xxx $ |
310 2: $Xinfo$ |
307 2: $Xinfo$ |
311 % remove |
308 % remove |
312 committed changeset d14c71265376 |
|
313 % status |
309 % status |
314 % rollback |
310 % rollback |
315 rolling back last transaction |
311 rolling back last transaction |
316 % status |
312 % status |
317 R a |
313 R a |
339 summary: firstline |
335 summary: firstline |
340 |
336 |
341 % commit rejecttest |
337 % commit rejecttest |
342 a |
338 a |
343 overwriting a expanding keywords |
339 overwriting a expanding keywords |
344 committed changeset 85e279d709ff |
|
345 % export |
340 % export |
346 % import |
341 % import |
347 applying ../rejecttest.diff |
342 applying ../rejecttest.diff |
348 % cat |
343 % cat |
349 expand $Id: a 4e0994474d25 Thu, 01 Jan 1970 00:00:03 +0000 user $ rejecttest |
344 expand $Id: a 4e0994474d25 Thu, 01 Jan 1970 00:00:03 +0000 user $ rejecttest |
363 % kwexpand x/a should abort |
358 % kwexpand x/a should abort |
364 abort: outstanding uncommitted changes |
359 abort: outstanding uncommitted changes |
365 x/a |
360 x/a |
366 x/a: copy a:779c764182ce5d43e2b1eb66ce06d7b47bfe342e |
361 x/a: copy a:779c764182ce5d43e2b1eb66ce06d7b47bfe342e |
367 overwriting x/a expanding keywords |
362 overwriting x/a expanding keywords |
368 committed changeset cfa68229c116 |
|
369 % cat a |
363 % cat a |
370 expand $Id: x/a cfa68229c116 Thu, 01 Jan 1970 00:00:03 +0000 user $ |
364 expand $Id: x/a cfa68229c116 Thu, 01 Jan 1970 00:00:03 +0000 user $ |
371 do not process $Id: |
365 do not process $Id: |
372 xxx $ |
366 xxx $ |
373 $Xinfo: User Name <user@example.com>: xa $ |
367 $Xinfo: User Name <user@example.com>: xa $ |