Hi, On Mon, 10 Nov 2008, Junio C Hamano wrote: > Francis Galiegue <fg@xxxxxxxxxxxx> writes: > > > A very nice git feature, without even going as far as merges, is the > > cherry pick feature. > > I thought cherry-picking needs to be done in terms of 3-way merge, not > diff piped to patch, for correctness's sake. I haven't checked how RCS merge does it, but I know how xdiff/xmerge.c does it ;-) Basically, it takes the two diffs relative to the base file and works on the overlapping hunks (i.e. on hunks where the ranges in the base file overlap). So we need a diff algorithm very much if we were to imitate that code in JGit, which I very much plan to do. Ciao, Dscho -- To unsubscribe from this list: 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
