Strategies for push/merge problem?

Kevin Christen kevin.christen at gmail.com
Wed Jul 16 08:10:19 CDT 2008


Peter,

Would you share this script with list?

Thanks,
Kevin Christen

On Wed, Jul 16, 2008 at 1:06 AM, Peter Arrenbrecht <
peter.arrenbrecht at gmail.com> wrote:

> On Wed, Jul 16, 2008 at 3:35 AM, Sean Russell <hg at ser1.net> wrote:
> > On Monday 14 July 2008 10:45:41 pm Douglas Philips wrote:
> >> >     http://www.selenic.com/mercurial/wiki/index.cgi/ShelveExtension
> >>
> >> Looks nice, but the announcement is 1.5 years old, and the
> >
> > Actually, local clones pretty much remove the need for shelving.  The
> main
> > advantage for shelving that local clones don't satisfy is when you're
> using
> > an IDE, and setting up a new project is non-trivial.  For example, it is
> > much, much easier to "svn switch" in Eclipse than it is to create an
> entirely
> > new project, and 90% of the overhead *isn't* in the checking out. It is
> in
> > walking through the Wizards to create a project.  Shelving lets you
> re-use a
> > workspace, which is a huge advantage when you're using an IDE.
>
> I use Eclipse extensively. I rely on a small script to initialize new
> clones with the proper Eclipse project files. Then I can either use a
> symlink to point to the active clone and run Eclipse on the symlink,
> or just import the new clone into Eclipse as a new project. I have
> come to prefer the latter approach recently.
>
> The advantage over shelve is that sometimes my one-liners turn out to
> be just a trifle more complex than that (usually really, as they need
> test support, too), and this makes it easy to go back to them and
> improve, or use mq, or whatever is needed.
>
> -parren
> _______________________________________________
> Mercurial mailing list
> Mercurial at selenic.com
> http://selenic.com/mailman/listinfo/mercurial
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://selenic.com/pipermail/mercurial/attachments/20080716/7ae98a21/attachment.htm 


More information about the Mercurial mailing list