Merging - are we doing something wrong?

[Luis Navarro]

On Thu, Sep 30, 2010 at 10:54 PM, Kurt Granroth <kurt.mercurial at granroth.com
> wrote:

> On 9/30/10 10:41 PM, Luis Navarro wrote:
>
>> Thanks to all who replied....all of this info was *extremely* helpful.
>>
>> One follow-up question: is there a standard option or extension that
>> will momentarily move all files with uncommitted changes out of the
>> working directory (so I can run a merge) and then allow me to bring them
>> back?
>>
>>
> Yes, the 'shelve' extension:
>
> http://mercurial.selenic.com/wiki/ShelveExtension
>
> Some version of this ships with TortoiseHg but I don't think it's the one
> linked by the twiki page.
>
> In any event, 'shelving' an uncommitted change is a very trivial way of
> just moving files out of the way.  HOWEVER, it's trivial nature can also be
> its downfall.  That is, it does not do anything like merging when you
> 'unshelve' your changes... and reacts badly if the unshelving doesn't work.
>
> There's also the 'attic' extension:
>
> http://mercurial.selenic.com/wiki/AtticExtension
>
> That's a good page if only for the relatively in-depth comparison of the
> various tools that can deal with this issue.
>

Thanks!  Both of these look very interesting.  I'll investigate further.
Any idea if either work with binary files?  I'm also curious if attic is
usable from within Tortoise as some of my users are GUI-only users.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial/attachments/20101001/786118ad/attachment.html>