[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Merged branch with history (Was: Small repository problems) (urgent)

From: Dustin J. Mitchell
Subject: Merged branch with history (Was: Small repository problems) (urgent)
Date: Sat, 1 Aug 2009 21:56:03 -0400

On Sat, Aug 1, 2009 at 9:23 PM, Dustin J. Mitchell<address@hidden> wrote:
> I'll take this on.  The submodule thing is causing me lots of grief.
> That makes it my itch to scratch :)

OK, see:
It's my first octopus merge!!

This is a fast-forward update of both of:
 master (with all of the macros at the top level)
 maint (the autotools and supporting stuff)
which means that anyone following either of these branches can merge
in my new master without any trouble.

It also maintains full history for the macros in m4/, by virtue of a
'git filter-branch' run.  Things aren't all sunny -- the repo now
contains two commits for each change to the macros (one at the top
level, and one in m4/).  The trees are similar, though, so this
doesn't seem to waste much space -- my repository is still only 1.8M.

I'd like to hear from Francesco or Peter before I commit this, but on
the other hand I'd like to commit it soon, so as to avoid others
having to merge over this significant change.  Please take a look!


Open Source Storage Engineer

reply via email to

[Prev in Thread] Current Thread [Next in Thread]