[Bug 5431] New: Shelve does not respect --keep when user intervention is required

[bugzilla at mercurial-scm.org]

https://bz.mercurial-scm.org/show_bug.cgi?id=5431

            Bug ID: 5431
           Summary: Shelve does not respect --keep when user intervention
                    is required
           Product: Mercurial
           Version: unspecified
          Hardware: PC
                OS: Mac OS
            Status: UNCONFIRMED
          Severity: feature
          Priority: wish
         Component: shelve
          Assignee: bugzilla at selenic.com
          Reporter: ikostia at fb.com
                CC: mercurial-devel at selenic.com

Here's a sample test which does not pass:

Unshelve respects --keep even if user intervention is needed
  $ hg init unshelvekeep
  $ echo 1 > file && hg ci -Am 1
  adding file
  $ echo 2 >> file
  $ hg shelve
  shelved as default
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  $ echo 3 >> file && hg ci -Am 13
  $ hg shelve --list
  default         (1s ago)    changes to: 1
  $ hg unshelve --keep
  unshelving change 'default'
  rebasing shelved changes
  rebasing 3:1d24e58054c8 "changes to: 1" (tip)
  merging file
  warning: conflicts while merging file! (edit, then use 'hg resolve --mark')
  unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue')
  [1]
  $ hg resolve --mark file
  (no more unresolved files)
  continue: hg unshelve --continue
  $ hg unshelve --continue
  rebasing 3:1d24e58054c8 "changes to: 1" (tip)
  unshelve of 'default' complete
  $ hg shelve --list
  default         (1s ago)    changes to: 1

To solve this, we need to store keep in the shelvedstate file. I will send a
patch.

-- 
You are receiving this mail because:
You are on the CC list for the bug.