575 |/ |
575 |/ |
576 o 0 a test |
576 o 0 a test |
577 |
577 |
578 $ mv f.orig f |
578 $ mv f.orig f |
579 $ echo other change >> a |
579 $ echo other change >> a |
580 $ hg unshelve |
580 $ hg unshelve --date '1073741824 0' |
581 unshelving change 'default' |
581 unshelving change 'default' |
582 temporarily committing pending changes (restore with 'hg unshelve --abort') |
582 temporarily committing pending changes (restore with 'hg unshelve --abort') |
583 rebasing shelved changes |
583 rebasing shelved changes |
584 merging f |
584 merging f |
585 warning: conflicts during merge. |
585 warning: conflicts during merge. |
586 merging f incomplete! (edit conflicts, then use 'hg resolve --mark') |
586 merging f incomplete! (edit conflicts, then use 'hg resolve --mark') |
587 unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue') |
587 unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue') |
588 [1] |
588 [1] |
589 $ hg log -G --template '{rev} {desc|firstline} {author}' |
589 $ hg log -G --template '{rev} {desc|firstline} {author} {date|isodate}' |
590 @ 5 changes to 'commit stuff' shelve@localhost |
590 @ 5 changes to 'commit stuff' shelve@localhost 1970-01-01 00:00 +0000 |
591 | |
591 | |
592 | @ 4 pending changes temporary commit shelve@localhost |
592 | @ 4 pending changes temporary commit shelve@localhost 2004-01-10 13:37 +0000 |
593 |/ |
593 |/ |
594 o 3 commit stuff test |
594 o 3 commit stuff test 1970-01-01 00:00 +0000 |
595 | |
595 | |
596 | o 2 c test |
596 | o 2 c test 1970-01-01 00:00 +0000 |
597 |/ |
597 |/ |
598 o 0 a test |
598 o 0 a test 1970-01-01 00:00 +0000 |
599 |
599 |
600 $ hg st |
600 $ hg st |
601 M f |
601 M f |
602 ? f.orig |
602 ? f.orig |
603 $ cat f |
603 $ cat f |