[PATCH] misc size-shrinkage; merges

Rob Landley rob at landley.net
Wed Aug 23 22:07:34 UTC 2006


On Saturday 19 August 2006 10:24 am, Aurelien Jacobs wrote:
> On Fri, 18 Aug 2006 23:49:01 -0400
> Rob Landley <rob at landley.net> wrote:
> 
> > On Friday 18 August 2006 11:53 am, Bernhard Fischer wrote:
> > > Hello,
> > > 
> > > Just a heads up..
> > > I plan to push the below patchset (split-up, of course) into my
> > 
> > Yes please.  (Reviewing 4000 lines at once ain't fun.)
> > 
> > > 'busybox_scratch' branch soonish, then merge that branch back into
> > > trunk.
> > > Unfortunately i have not yet setup a local git repo mainly because i
> > > didn't sit down and see what steps are needed to set that nifty tool up,
> > > i admit, so pushing that patch into the official svn will be a little
> > > bit of a pain for me..
> > 
> > I went with Mercurial because I find it simpler to set up and admin, it's 
> > faster, it's one project instead of 3 or 4, it's about 1/10th as much code 
> > (being written in Python will do that), and the on-disk file layout 
doesn't 
> > make by brain hurt.  But I have nothing against git. :)
> > 
> > I've pinged Junio and Matt about a bidirectional git-mercural converter 
that 
> > would allow each to pull from the other.  (They both say it's possible in 
> > theory...)  Apparently I wasn't the first to ask about this...
> 
> AFAIK the linuxtv.org guys are using mercurial and they have an automatic
> conversion to git so that Linus can pull directly.
> I don't know if they use tailor [1] or anything else.
> 
> Aurel

When I talked to Matt at OLS, he said that one direction has been done, but 
not the other.  If Bernhard's going to use Git and I'm goign to use 
mercurial, we need to be able to pull from each other.  (I need to be able to 
pull a clean set of changes from his export branch, then he needs to be able 
to pull my main branch into his main branch to fork off a new export branch 
from.  Otherwise the histories can't come back together.)

It's only a matter of time, though...

Rob
-- 
Never bet against the cheap plastic solution.



More information about the busybox mailing list