equal
deleted
inserted
replaced
289 do not process $Id: |
289 do not process $Id: |
290 xxx $ |
290 xxx $ |
291 $Id: c,v 40a904bbbe4c 1970/01/01 00:00:01 user $ |
291 $Id: c,v 40a904bbbe4c 1970/01/01 00:00:01 user $ |
292 tests for different changenodes |
292 tests for different changenodes |
293 |
293 |
|
294 record |
|
295 |
|
296 $ echo '$Id$' > r |
|
297 $ hg add r |
|
298 |
294 record chunk |
299 record chunk |
295 |
300 |
296 $ python -c \ |
301 $ python -c \ |
297 > 'l=open("a").readlines();l.insert(1,"foo\n");l.append("bar\n");open("a","w").writelines(l);' |
302 > 'l=open("a").readlines();l.insert(1,"foo\n");l.append("bar\n");open("a","w").writelines(l);' |
298 $ hg record -d '1 10' -m rectest<<EOF |
303 $ hg record -d '1 10' -m rectest a<<EOF |
299 > y |
304 > y |
300 > y |
305 > y |
301 > n |
306 > n |
302 > EOF |
307 > EOF |
303 diff --git a/a b/a |
308 diff --git a/a b/a |
317 |
322 |
318 $ hg identify |
323 $ hg identify |
319 d17e03c92c97+ tip |
324 d17e03c92c97+ tip |
320 $ hg status |
325 $ hg status |
321 M a |
326 M a |
|
327 A r |
322 |
328 |
323 Cat modified file a |
329 Cat modified file a |
324 |
330 |
325 $ cat a |
331 $ cat a |
326 expand $Id: a,v d17e03c92c97 1970/01/01 00:00:01 test $ |
332 expand $Id: a,v d17e03c92c97 1970/01/01 00:00:01 test $ |
329 xxx $ |
335 xxx $ |
330 bar |
336 bar |
331 |
337 |
332 Diff remaining chunk |
338 Diff remaining chunk |
333 |
339 |
334 $ hg diff |
340 $ hg diff a |
335 diff -r d17e03c92c97 a |
341 diff -r d17e03c92c97 a |
336 --- a/a Wed Dec 31 23:59:51 1969 -0000 |
342 --- a/a Wed Dec 31 23:59:51 1969 -0000 |
337 +++ b/a * (glob) |
343 +++ b/a * (glob) |
338 @@ -2,3 +2,4 @@ |
344 @@ -2,3 +2,4 @@ |
339 foo |
345 foo |
348 |
354 |
349 $ echo foo > msg |
355 $ echo foo > msg |
350 |
356 |
351 - do not use "hg record -m" here! |
357 - do not use "hg record -m" here! |
352 |
358 |
353 $ hg record -l msg -d '1 11'<<EOF |
359 $ hg record -l msg -d '1 11' a<<EOF |
354 > y |
360 > y |
355 > y |
361 > y |
356 > y |
362 > y |
357 > EOF |
363 > EOF |
358 diff --git a/a b/a |
364 diff --git a/a b/a |
413 $ cat z |
419 $ cat z |
414 $Id$ |
420 $Id$ |
415 $ hg forget y z |
421 $ hg forget y z |
416 $ rm y z |
422 $ rm y z |
417 |
423 |
418 $ hg update -C |
424 record added file alone |
419 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
425 |
420 |
|
421 record added file |
|
422 |
|
423 $ echo '$Id$' > r |
|
424 $ hg add r |
|
425 $ hg -v record -l msg -d '1 12' r<<EOF |
426 $ hg -v record -l msg -d '1 12' r<<EOF |
426 > y |
427 > y |
427 > EOF |
428 > EOF |
428 diff --git a/r b/r |
429 diff --git a/r b/r |
429 new file mode 100644 |
430 new file mode 100644 |
434 $ hg --verbose rollback |
435 $ hg --verbose rollback |
435 rolling back to revision 2 (undo commit) |
436 rolling back to revision 2 (undo commit) |
436 overwriting r shrinking keywords |
437 overwriting r shrinking keywords |
437 $ hg forget r |
438 $ hg forget r |
438 $ rm msg r |
439 $ rm msg r |
|
440 $ hg update -C |
|
441 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
439 |
442 |
440 Test patch queue repo |
443 Test patch queue repo |
441 |
444 |
442 $ hg init --mq |
445 $ hg init --mq |
443 $ hg qimport -r tip -n mqtest.diff |
446 $ hg qimport -r tip -n mqtest.diff |