On Tue, Oct 02, 2007 at 07:51:48PM +0000, martin f krafft wrote: > Well, with gitignore I am ready to say that merges should be > resolved in an additive way. Remember that I am talking about an > intergration branch, and if feature branches A and B used to ignore > .o files, and now B suddenly does not ignore them anymore, the only > real reason I can think of is that it was rewritten in a languages > other than C*. So then you *still* want to ignore .o files in the > integration branch. > > Basically I am saying that it should be > > cat $gitignore_files | sort -u Except that this would not work, just take that example (for the sake of conciseness I put lines as members of a set): Common ancestor content: (bar, foo, quux) Left child: (bar, baz, foo, quux) Right child: (bar, quux) This one is a conflict, and if you apply your method, the merge always "works" (as in has no cases where it fails) and would yield a result like: (bar, baz, foo, quux) whereas it's probably (bar, baz, quux) that would be the proper one (aka left branch added a new ignore `baz` and the right one removed it). The proper way for gitignore is probably to work on the sets operations, like diff does with lines, but without taking ordering into account. What gets harder is when your lists are: Ancestor: (aa*, aaa, bbb) Left child: (aa*, bbb) <-- remove aaa because aa* covers it Right child: (aaa, aabcd, bbb, cc*) <-- remove aa* and be explicit The proper result is probably: (aaa, aabcd, bbb, cc*) but is in fact a case of conflict, because the "left" child could have used the fact that aa* was present and hide say a aaXXX that the right child did not had, and the merge would be wrong. Of course, .gitignore aren't _that_ important and if you ignore one less file, or one too many, git will continue to behave properly, but well, merge implementations aren't _that_ trivial. -- ·O· Pierre Habouzit ··O madcoder@xxxxxxxxxx OOO http://www.madism.org
Attachment:
pgptipdWmNSPr.pgp
Description: PGP signature
