equal
deleted
inserted
replaced
258 tag: tip |
258 tag: tip |
259 user: User Name <user@example.com> |
259 user: User Name <user@example.com> |
260 date: Thu Jan 01 00:00:02 1970 +0000 |
260 date: Thu Jan 01 00:00:02 1970 +0000 |
261 summary: firstline |
261 summary: firstline |
262 |
262 |
263 % commit conflicttest |
263 % commit rejecttest |
264 a |
264 a |
265 overwriting a expanding keywords |
265 overwriting a expanding keywords |
266 % export |
266 % export |
267 % import |
267 % import |
268 applying ../conflicttest.diff |
268 applying ../rejecttest.diff |
269 % cat |
269 % cat |
270 expand $Id: a 70a392d4a4e4 Thu, 01 Jan 1970 00:00:03 +0000 user $ conflicttest |
270 expand $Id: a 82983f13f138 Thu, 01 Jan 1970 00:00:03 +0000 user $ rejecttest |
271 do not process $Id: conflicttest |
271 do not process $Id: rejecttest |
272 xxx $ |
272 xxx $ |
273 $Xinfo: User Name <user@example.com>: conflict? $ |
273 $Xinfo: User Name <user@example.com>: rejects? $ |
274 expand $Id: a 70a392d4a4e4 Thu, 01 Jan 1970 00:00:03 +0000 user $ conflicttest |
274 expand $Id: a 82983f13f138 Thu, 01 Jan 1970 00:00:03 +0000 user $ rejecttest |
275 do not process $Id: conflicttest |
275 do not process $Id: rejecttest |
276 xxx $ |
276 xxx $ |
277 $Xinfo: User Name <user@example.com>: conflict? $ |
277 $Xinfo: User Name <user@example.com>: rejects? $ |
278 ignore $Id$ |
278 ignore $Id$ |
279 |
279 |
280 % rollback |
280 % rollback |
281 rolling back last transaction |
281 rolling back last transaction |
282 % clean update |
282 % clean update |