Re: Google Summer of Code 2009: GIT

From: saurabh gupta <saurabhgupta1403@gmail.com>
Date: Mar 11, 2009, 12:11 UTC
Message-ID: <ab9fa62a0903110511u63e7d46dr3bb783ee891ca4ae@mail.gmail.com>
In-Reply-To: <alpine.DEB.1.00.0903111255470.10279@pacific.mpi-cbg.de>

On Wed, Mar 11, 2009 at 5:28 PM, Johannes Schindelin <Johannes.Schindelin@gmx.de> wrote:

Show 18 quoted lines

>
> Hi,
>
> Welcome, Saurabh!
>
> On Wed, 11 Mar 2009, Saurabh Gupta wrote:
>
> > /*About GSoC GIT ideas; */Here are the ideas which I found to be
> > interested in. Although, I would like to discuss any other idea than
> > these in GIT organization.
> >
> > *1) Domain specific merge helpers* Intelligence in the merger can be put
> > which modifies the source file according the format. Different file
> > formats can be put in the merger to support.
>
> You said that you are interested in this project, but from your mails I do
> not see what are the specific reasons why.
>

All right. May be I lacked in my mail to specify the reason for my interest. The reason is that from my past experience, I got the notion that this project is according to my interest and is doable in the three months time period. Another reason is that I have been using the versioning tools like svn and now perforce for a long time and this added up to my interest.

> IMHO this project can only fly if you have a specific file format that you
> absolutely want to be able to merge; otherwise, it will be an uphill
> fight.
>

Well, as suggested on the wiki, I would like to work on the xml file formats as I have quite experience of working with xml files and parsing them using msxml and nsxml libraries and some of personal wrappers.

How about my idea of making the support of new file formats in the plug-ins (suggested in my last post). I would like to discuss more on this and any new suggestions or methods are welcome.

> Personally, I would _love_ to see a good graphical tool (maybe written
> in Tcl/Tk) to help merging conflicts in LaTeX files, but I just do not
> have the time...

Ok. What I am thinking is to implement something like that of graphical *diff* command output but in these special file formats, it ought to have intelligence to bring out the difference of two files (like latex or xml) in a readable manner. For example, in case of xml files, if one file contains an inner tag block , then merger GUI should notify the user in a readable manner about this added tag rather than only the difference in lines.

>
> Ciao,
> Dscho
>

Regards...

-- Saurabh Gupta Senior, NSIT,New Delhi, India