--[SPAM]--Re: Rebase and fast-forward-merge workflows

[Jimmy Bogard]

And as an aside, [track.current] doesn't have this behavior of ff-merge.
 Tracked bookmarks only move on commits, not on this operation of "nothing
to rebase/merge, we'll just move your bookmark for you".

Thanks,

Jimmy

On Tue, Feb 8, 2011 at 4:10 AM, Jouni Airaksinen <Jouni.Airaksinen at descom.fi
> wrote:

> Just wondering why it cannot be set default "true"? Of course there's the
> backwards compability, but this silly configuration option which "everybody"
> has to specifically configure is easy to forget if you don't know about it.
> Ie. with TortoiseHg you have to manually configure it instead of just
> enabling the extension. Are there people who consider the non-tracked
> bookmarks useful? I would guess that is the minority or the people who don't
> know about this configuration which makes bookmarks THE bookmarks.
>
> Maybe for Mercurial 1.8 as it's major revision, so this kind of small
> change for convience would be allowed instead of making backwards
> compatibility to extreme. I would consider non tracking bookmarks more or
> less bug instead of a feature to switch.. ;)
>
>
>
> From:        Matt Mackall <mpm at selenic.com>
> To:        Jimmy Bogard <jimmy.bogard at gmail.com>
> Cc:        mercurial at selenic.com
> Date:        08.02.2011 06.42
> Subject:        --[SPAM]--Re: Rebase and fast-forward-merge workflows
> Sent by:        mercurial-bounces at selenic.com
> ------------------------------
>
>
>
> On Mon, 2011-02-07 at 22:26 -0600, Jimmy Bogard wrote:
> > I'm still not gathering how "hg update" is like a fast-forward merge.
>
> >   Git's FF merge moves the branch pointer up, where hg up, either with
> > branches or bookmarks does nothing of the sort.  If I merge a bookmark
> > into its child, in git the branch pointer is moved up.  In Hg, nothing
> > happens with rebase/merge.  I wind up doing a "hg bookmark -f -r
> > Topic1 master", and that's after I've had to check exactly what the
> > ancestry looks like.
>
> We don't speak Git here but it sounds like you want to turn on
> "[bookmarks] track.current".
>
> --
> Mathematics is the supreme nostalgia of our time.
>
>
> _______________________________________________
> Mercurial mailing list
> Mercurial at selenic.com
> http://selenic.com/mailman/listinfo/mercurial
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial/attachments/20110208/542de4f9/attachment.html>