Dear diary, on Fri, Oct 20, 2006 at 10:49:53PM CEST, I got a letter where David Lang <dlang@digitalinsight.com> said that... > On Fri, 20 Oct 2006, Petr Baudis wrote: > > > > >Dear diary, on Fri, Oct 20, 2006 at 07:48:58PM CEST, I got a letter > >where Linus Torvalds <torvalds@osdl.org> said that... > >>So yeah, I've seen a few strange cases myself, but they've actually been > >>interesting. Like seeing how much of a file was just a copyright license, > >>and then a file being considered a "copy" just because it didn't actually > >>introduce any real new code. > > > >Well it's certainly "interesting" and fun to see, but is it equally fun > >to handle mismerges caused by a broken detection? > > > >I've talked to some people who really didn't mind (or even liked) Git's > >heuristics when it came to _inspecting_ movement of content, but were > >really nervous about merge following such heuristics. > > remember, git only stores the results. so when you are merging it doesn't > even look for renames. Of course it does look for renames; when you use the recursive strategy, it will try to merge across renames. -- Petr "Pasky" Baudis Stuff: http://pasky.or.cz/ #!/bin/perl -sp0777i<X+d*lMLa^*lN%0]dsXx++lMlN/dsM0<j]dsj $/=unpack('H*',$_);$_=`echo 16dio\U$k"SK$/SM$n\EsN0p[lN*1 lK[d2%Sa2/d0$^Ixp"|dc`;s/\W//g;$_=pack('H*',/((..)*)$/) - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.htmlReceived on Sat Oct 21 06:53:37 2006
This archive was generated by hypermail 2.1.8 : 2006-10-21 06:56:26 EST