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