Show More
@@ -458,7 +458,9 b' def unshelvecontinue(ui, repo, state, op' | |||||
458 | ('c', 'continue', None, |
|
458 | ('c', 'continue', None, | |
459 | _('continue an incomplete unshelve operation')), |
|
459 | _('continue an incomplete unshelve operation')), | |
460 | ('', 'keep', None, |
|
460 | ('', 'keep', None, | |
461 |
_('keep shelve after unshelving')) |
|
461 | _('keep shelve after unshelving')), | |
|
462 | ('', 'date', '', | |||
|
463 | _('set date for temporary commits (DEPRECATED)'), _('DATE'))], | |||
462 | _('hg unshelve [SHELVED]')) |
|
464 | _('hg unshelve [SHELVED]')) | |
463 | def unshelve(ui, repo, *shelved, **opts): |
|
465 | def unshelve(ui, repo, *shelved, **opts): | |
464 | """restore a shelved change to the working directory |
|
466 | """restore a shelved change to the working directory | |
@@ -553,6 +555,7 b' def unshelve(ui, repo, *shelved, **opts)' | |||||
553 |
|
555 | |||
554 | tempopts = {} |
|
556 | tempopts = {} | |
555 | tempopts['message'] = "pending changes temporary commit" |
|
557 | tempopts['message'] = "pending changes temporary commit" | |
|
558 | tempopts['date'] = opts.get('date') | |||
556 | ui.quiet = True |
|
559 | ui.quiet = True | |
557 | node = cmdutil.commit(ui, repo, commitfunc, [], tempopts) |
|
560 | node = cmdutil.commit(ui, repo, commitfunc, [], tempopts) | |
558 | tmpwctx = repo[node] |
|
561 | tmpwctx = repo[node] |
@@ -577,7 +577,7 b' unshelve and conflicts with untracked fi' | |||||
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 | |
@@ -586,16 +586,16 b' unshelve and conflicts with untracked fi' | |||||
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 |
General Comments 0
You need to be logged in to leave comments.
Login now