RFC: migrating to git

[roconnor at theorem.ca]

On Tue, 11 Jan 2011, Simon Marlow wrote:

> Thanks for this.  I distilled your example into a shell script that uses git, 
> and demonstrates that git gets the merge wrong:
>
>  http://hpaste.org/42953/git_mismerge

I've posted an annotation at

http://hpaste.org/paste/42953/git_mismerge_annotation#p42966

which shows the difference between pulling patches one at a time, and 
pulling both patches together.

> Still, git could get this merge right, it just doesn't (I know there are more 
> complex cases that would be very hard for git to get right).  I suspect that 
> in practice this rarely matters, because context-based merging usually does 
> the right thing.

The operative word being *usually*.  Remember what Dijkstra said. :)

-- 
Russell O'Connor                                      <http://r6.ca/>
``All talk about `theft,''' the general counsel of the American Graphophone
Company wrote, ``is the merest claptrap, for there exists no property in
ideas musical, literary or artistic, except as defined by statute.''