[PATCH] Make fast forward merges more like normal merges.
Eric M. Hopper
hopper at omnifarious.org
Wed Jun 6 19:53:58 CDT 2007
On Wed, 2007-06-06 at 17:46 -0700, Brendan Cully wrote:
> On Wednesday, 06 June 2007 at 19:44, Nathan Jones wrote:
> > I have been using named branches and fast forward merges lately, but I
> > have found that fast forward merges work differently than normal merges:
> >
> > 1. Parents are not listed.
> > 2. hg log -M displays fast forward merges.
> > 3. hg log -p does not display a diff like regular merges.
>
> I don't have a super-strong opinion about it, but I'm not sure these
> are bad things. It seems like you're turning fast-forward merges back
> into plain old merges.
What are fast forward merges, and why were they created?
Thanks,
--
The best we can hope for concerning the people at large is that they
be properly armed. -- Alexander Hamilton
-- Eric Hopper (hopper at omnifarious.org http://www.omnifarious.org/~hopper) --
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 185 bytes
Desc: This is a digitally signed message part
Url : http://selenic.com/pipermail/mercurial-devel/attachments/20070606/a2ca9616/attachment.pgp
More information about the Mercurial-devel
mailing list