A new plea for merging while you have outstanding committed changes

[Didly Bom]

On Mon, Aug 9, 2010 at 10:25 AM, Aardwolf <toiletpot at gmail.com> wrote:

>
> The bugs of the shelve extension? For me it simply doesn't work. Its shelve
> command seems to work, but its unshelve command not. It doesn't restore
> anything. It's a one-way path for your changes to go, never to come back.
> Whether or not you use a shelve name with "-n", when you do "hg shelve",
> then "hg unshelve", your changes are not back. Plus also it gives bad
> feedback (unshelve always says "restoring backup files", no matter how many
> times in a row you call it and if it actually did anything at all, and it
> seems to not clear a shelf after using unshelve either and refuses to
> shelve
> to that shelf again). Plus it's not even an official plugin, not a good
> sign.
>
> I think a shelve extension is useful once it can do this (and the shelve
> tools for svn and cvs that I know are this reliable, it's strange that this
> seems to be so difficult for mercurial):
>
> -You have made multiple commits + have changes in your working dir that you
> don't want to commit.
> -You want to push but have to merge first.
> -Before you merge, you type "hg shelve"
> -Then "hg pull", "hg update", "hg merge", "hg commit" & "hg push"
> -Then "hg unshelve", and all your uncommitted changes are back, 100%
> reliability if there would have been no conflicts , and if there's a
> conflict, show a conflict editor, instead of bailing out & doing nothing.
> -The same scenario can be repeated later without the shelve tool giving an
> error due to the fact that you've used it earlier (yes, the standard hg
> shelve does that).


I am surprised that you had so many problems with the shelve extension. I
and several members of my team have been using it for a while and we haven't
had any major problems. We use TortoiseHg on Windows, which bundles the
shelve extension, and it really works great.

You have to be a little careful since it is sometimes possible to apply your
shelve changes multiple times into your working copy, and the TortoiseHG GUI
is a little confusing, but it is certainly usable.

Obviously this single data point does not help you, but do not assume that
the extension does not work for anybody, since it does work at least for
some of us.

Angel
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial/attachments/20100809/ade4f201/attachment.html>