[PATCH 4 of 4] shelve: add a shelve extension to save/restore working changes

Bryan O'Sullivan bos at serpentine.com
Fri May 31 18:51:24 CDT 2013


On Thu, May 30, 2013 at 6:36 AM, Idan Kamara <idankk86 at gmail.com> wrote:

>
> Are you stripping the temporary commit and its bundled ancestors when an
> unshelve succeeds?
>

Yep.


> Won't the name conflict cause issues for existing users of hgshelve? Why
> not call it stash?
>

The extensions have different names, so you won't accidentally get one if
you have the other enabled. I don't see a problem with them providing the
same command names, since I can't imagine someone wanting to use both.


> Does this file pass tests? There are some unused imports and
> commented code here.
>

It passes the new shelve test, but needs a tiny bit of tweaking to pass the
check-code tests.


> > +  $ hg unshelve
> > +  unshelving change 'default-01'
> > +  adding changesets
> > +  adding manifests
> > +  adding file changes
> > +  added 1 changesets with 3 changes to 7 files
> > +  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
>
> Shouldn't it say 1 files updated here?
>

For this particular test, the change being unshelved makes the same change
to a file as the commit it's being unshelved onto - so the result should
indeed be no changes.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://selenic.com/pipermail/mercurial-devel/attachments/20130531/693c3332/attachment.html>


More information about the Mercurial-devel mailing list