Re: CFT: merge-recursive in C (updated)

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

 




On Tue, 27 Jun 2006, Johannes Schindelin wrote:
> 
> Note that all Alex does was to translate the Python code to C. And in 
> Python, this horrible graph thing was necessary, because git is not 
> libified yet.

Ahh. I thought the Python thing used an external program to do all graph 
calculations.

One thing to look out for is (as Junio mentioned) that you do often want 
to merge things with externally controlled "history": either by having 
something like cherry-pick/rebase give fake history information, or by 
manually forcing a certain merge-base (possibly even an empty tree) in 
order to generate a merge of two unrelated histories.

> HOWEVER, I think it is a very good start. It _works_, albeit slow, and we 
> have test cases in place to make sure that our wonderful optimizations do 
> not break the tool.

Yeah, once it's all in C, it's going to be easier to move functionality 
around incrementally.

		Linus
-
: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]