Re: Google Summer of Code 2009: GIT

[saurabh gupta <saurabhgupta1403@gmail.com>]

On Thu, Mar 12, 2009 at 12:59 AM,  <david@lang.hm> wrote:
> On Wed, 11 Mar 2009, saurabh gupta wrote:
>
>> On Wed, Mar 11, 2009 at 10:02 PM,  <david@lang.hm> wrote:
>>>
>>> On Wed, 11 Mar 2009, Johannes Schindelin wrote:
>>>
>>>> Hi,
>>>>
>>>> On Wed, 11 Mar 2009, saurabh gupta wrote:
>>>>
>>
>> In case of only a terminal, It would be very difficult to show an OO
>> document to represent the *diff* output in both text as well in GUI.
>> For example, to indicate the changes in an OO document, we will have
>> to change the underlying XML file appropriately to show the markers
>> signs and other things in the conflict file. Now, if this file is
>> opened in terminal, it would not be at all comprehensible to see the
>> differences.
>>
>> The main thing is that to create *diff* for different file formats, we
>> will have to write the parser code accordingly.
>
> correct, and in the case of an XML file, the meaningful diff can be
> substantially shorter than what a text diff of the two files would be
> (whitespace changes that don't matter, even some tag ordering changes may
> not matter)
>
> I'm just asking that you don't get so fixated on what can be done in a GUI
> that you provide no benifit to people who don't have the GUI
>
> there are a _lot_ of XML based formats out there, having a diff/merge
> capability to make dealing with them better than just treating them as text
> files would be a _very_ useful thing.
>
> going beyond that and creating the ability to do the markup in
> application-specific ways, and present it to the user in a nice GUI would
> also be nice, but these are a step up after having the basic XML handling
> that isn't specific to a particular application.

Yes, but the thing is that the underlying codes and method will be
different for GUI part and terminal part to make it readable and
understandable. Like for OO Documents, if we aim to show the *diff*
output in the Office tool, then we have to change the xml file
accordingly. But the same xml file when used with terminal only, the
*diff* output is not clear.

As Johannes said in above post that for OO documents, while showing
the *diff* result, no xml data should be shown.

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