From: david@lang.hm Date: Thu, 12 Mar 2009 20:45:46 GMT Subject: Re: Google Summer of Code 2009: GIT Message-ID: In-Reply-To: On Fri, 13 Mar 2009, saurabh gupta wrote: > On Fri, Mar 13, 2009 at 1:29 AM, wrote: >> On Fri, 13 Mar 2009, saurabh gupta wrote: >> >>> Very well described, David. I agree with you and providing these merge >>> options to the user, merge drivers can do the work and mark the >>> conflicts according to the option. The work to do is to modify the >>> merge driver. I think in this way, even people who have only a >>> terminal can also gain from it. They can choose the apt option to see >>> the conflict markers in their way. So, the aim is to make merge driver >>> configurable and create the merged/conflicted file according to the >>> options. >> >> for the GSOC I suspect that the right thing to do is the define one or more >> merge drivers to create, and list what applications are going to be used for >> testing these merges. >> >> you and the mentor can decide what is a reasonable amount of work. >> > > I will very glad to hear about this thing from the mentor (Johannes > Schindelin, according to wiki). I will try to plan out the things in a > proper way to carry out this project if I get a chance to work on this > for GSoC 2009. > >> it may be just doing an XML merge driver is a summer's worth of work, or it >> may be that it's not really enough and you should try to do another one or >> two. >> >> it also may be that there is a lot of overlap between different merge >> drivers, and once you have the XML driver the others become fairly trivial >> to do. (I'm thinking the config file examples I posted earlier in the >> thread) > > with the options given to the user, one can handle the config files > also where order doesn't matter and also the whitespaces problem can > also be handled in the similar way. when I am mentioning config files here I'm thinking of ones that don't use XML (such as the git config file) a 'paragraph' merge driver could also help with things like a maintainers file where the order of the paragaphs doesn't matter, just the content inside each one. that's very similar to re-ordering XML tags, but with a slightly different syntax David Lang