equal
deleted
inserted
replaced
336 > y |
336 > y |
337 > n |
337 > n |
338 > EOF |
338 > EOF |
339 diff --git a/a b/a |
339 diff --git a/a b/a |
340 2 hunks, 2 lines changed |
340 2 hunks, 2 lines changed |
341 examine changes to 'a'? [Ynsfdaq?] |
341 examine changes to 'a'? [Ynesfdaq?] |
342 @@ -1,3 +1,4 @@ |
342 @@ -1,3 +1,4 @@ |
343 expand $Id$ |
343 expand $Id$ |
344 +foo |
344 +foo |
345 do not process $Id: |
345 do not process $Id: |
346 xxx $ |
346 xxx $ |
347 record change 1/2 to 'a'? [Ynsfdaq?] |
347 record change 1/2 to 'a'? [Ynesfdaq?] |
348 @@ -2,2 +3,3 @@ |
348 @@ -2,2 +3,3 @@ |
349 do not process $Id: |
349 do not process $Id: |
350 xxx $ |
350 xxx $ |
351 +bar |
351 +bar |
352 record change 2/2 to 'a'? [Ynsfdaq?] |
352 record change 2/2 to 'a'? [Ynesfdaq?] |
353 |
353 |
354 $ hg identify |
354 $ hg identify |
355 d17e03c92c97+ tip |
355 d17e03c92c97+ tip |
356 $ hg status |
356 $ hg status |
357 M a |
357 M a |
393 > y |
393 > y |
394 > y |
394 > y |
395 > EOF |
395 > EOF |
396 diff --git a/a b/a |
396 diff --git a/a b/a |
397 2 hunks, 2 lines changed |
397 2 hunks, 2 lines changed |
398 examine changes to 'a'? [Ynsfdaq?] |
398 examine changes to 'a'? [Ynesfdaq?] |
399 @@ -1,3 +1,4 @@ |
399 @@ -1,3 +1,4 @@ |
400 expand $Id$ |
400 expand $Id$ |
401 +foo |
401 +foo |
402 do not process $Id: |
402 do not process $Id: |
403 xxx $ |
403 xxx $ |
404 record change 1/2 to 'a'? [Ynsfdaq?] |
404 record change 1/2 to 'a'? [Ynesfdaq?] |
405 @@ -2,2 +3,3 @@ |
405 @@ -2,2 +3,3 @@ |
406 do not process $Id: |
406 do not process $Id: |
407 xxx $ |
407 xxx $ |
408 +bar |
408 +bar |
409 record change 2/2 to 'a'? [Ynsfdaq?] |
409 record change 2/2 to 'a'? [Ynesfdaq?] |
410 |
410 |
411 File a should be clean |
411 File a should be clean |
412 |
412 |
413 $ hg status -A a |
413 $ hg status -A a |
414 C a |
414 C a |
460 $ hg -v record -l msg -d '1 12' r<<EOF |
460 $ hg -v record -l msg -d '1 12' r<<EOF |
461 > y |
461 > y |
462 > EOF |
462 > EOF |
463 diff --git a/r b/r |
463 diff --git a/r b/r |
464 new file mode 100644 |
464 new file mode 100644 |
465 examine changes to 'r'? [Ynsfdaq?] |
465 examine changes to 'r'? [Ynesfdaq?] |
466 r |
466 r |
467 committed changeset 3:899491280810 |
467 committed changeset 3:899491280810 |
468 overwriting r expanding keywords |
468 overwriting r expanding keywords |
469 - status call required for dirstate.normallookup() check |
469 - status call required for dirstate.normallookup() check |
470 $ hg status r |
470 $ hg status r |
484 $ hg --verbose record -d '1 13' -m recignored<<EOF |
484 $ hg --verbose record -d '1 13' -m recignored<<EOF |
485 > y |
485 > y |
486 > EOF |
486 > EOF |
487 diff --git a/i b/i |
487 diff --git a/i b/i |
488 new file mode 100644 |
488 new file mode 100644 |
489 examine changes to 'i'? [Ynsfdaq?] |
489 examine changes to 'i'? [Ynesfdaq?] |
490 i |
490 i |
491 committed changeset 3:5f40fe93bbdc |
491 committed changeset 3:5f40fe93bbdc |
492 $ cat i |
492 $ cat i |
493 $Id$ |
493 $Id$ |
494 $ hg -q rollback |
494 $ hg -q rollback |