From: Johannes Schindelin Date: Fri, 02 Jun 2006 07:46:29 GMT Subject: Re: Importing Mozilla CVS into git Message-ID: In-Reply-To: <20060602044404.GB5429@spearce.org> Hi, On Fri, 2 Jun 2006, Shawn Pearce wrote: > Pavel Roskin wrote: > > On Fri, 2006-06-02 at 00:11 -0400, Shawn Pearce wrote: > > > > > GIT today requires not only a decent UNIX shell but also, GNU tools, > > > Perl and Python. Porting to Solaris has recently had some more > > > effort put into it to remove some of the GNU tool dependencies but > > > perhaps one of the most important features (git-merge-recursive) > > > is a Python script. > > > > The great thing about git is that it's modular. A single utility can be > > replaced and retested in the same environment, without having to rewrite > > the rest of the scripts. A dedicated programmer with good C and Python > > skills could rewrite git-merge-recursive.py in C in 2 days, I believe. > > Add a few days of bug fixing, of course. > > Heh. Funny you should mention that. I was just thinking a few > minutes ago about working on that exact change... I thought about this a couple of weeks ago. I recalled to have read something about the principle: if there is more than one merge-base candidate, it starts by merging the merge-base candidates until there is only one 'virtual' merge-base candidate. However, looking at the code I fainted. Sure, a lot should be way easier in C, because the functions are already there, _but_ it seemed too much work for one afternoon nevertheless (and I did not have more time to spare). Ciao, Dscho