[Bug 4059] New: Shelve extension cannot unshelve onto a parent of the WC parent used when shelving

[mercurial-bugs at selenic.com]

http://bz.selenic.com/show_bug.cgi?id=4059

          Priority: normal
            Bug ID: 4059
                CC: mercurial-devel at selenic.com
          Assignee: bugzilla at selenic.com
           Summary: Shelve extension cannot unshelve onto a parent of the
                    WC parent used when shelving
          Severity: bug
    Classification: Unclassified
                OS: Linux
          Reporter: martin at geisler.net
          Hardware: PC
            Status: UNCONFIRMED
           Version: unspecified
         Component: rebase
           Product: Mercurial

(I'm choosing rebase as component since there isn't yet a component for shelve)

I shelved some changed while being on a branch head with intention of
unshelving them at an earlier point on the same branch. That didn't work: after
unshelving I was back at the branch tip again.

This is kind of expected since I understand that unshelve applies the bundle
and then rebases tip onto '.'. Rebase wont let you move a commit backwards like
that and shelve inherited that limitation.

I forget if the restriction is intentional in rebase, but it feels like lifting
it would be a good idea -- if not for rebase in general, then at least
internally for shelve.


Reproduction recipe:

% hg init
% echo x > x
% hg add x
% hg commit -m x
% echo y > y
% hg add y
% hg commit -m y
% echo z > z
% hg add z
% hg shelve
shelved as default
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
% hg up 0
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
% hg unshelve
unshelving change 'default'
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 3 files
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
% hg stat
A z
% hg glog
@  changeset:   1:d9ddf32affab
|  tag:         tip
|  user:        Martin Geisler <martin.geisler at dealini.ch>
|  date:        Fri Oct 11 15:16:03 2013 +0200
|  summary:     y
|
o  changeset:   0:db4cc7e4d3d5
   user:        Martin Geisler <martin.geisler at dealini.ch>
   date:        Fri Oct 11 15:15:53 2013 +0200
   summary:     x

% hg version
Mercurial Distributed SCM (version 2.7.2+30-e828975722c8)

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