It helps me to think of a plain ASCII text file source (C,java,perl etc) as a markup language where a newline is the only tag.
To extend the delta generation of a more structured markup language, such as XML, probably would require knowledge of that syntax by the diff program. A quick an dirty approach may be to prefix all opening tags with a newline, suffix all closing tags with a newline, and then remove all blank lines unless inside a tag (in and among CDATA); essentially run it through an xml equiv of cb(1) or indent(1). --@@ ~ DavidC No State shall convert a liberty into a privilege, license it, and charge a fee therefore. ~ Murdock v. Pennsylvania, 319 US 105, US Supreme Court, 1943. > -----Original Message----- > From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED]] > Sent: Thursday, April 25, 2002 6:24 PM > To: [EMAIL PROTECTED] > Cc: [EMAIL PROTECTED] > Subject: Re: merge mode for XML > > > [ On Thursday, April 25, 2002 at 16:10:37 (-0500), Sean Hager wrote: ] > > Subject: merge mode for XML > > > > Is there a merge mode or merge algorithm that works well > for XML files? > > Doesn't diff3 work well enough? > > XML files are more or less just text, right? > > If the tags are all on separate lines, then regardless of whether > content is changed, or tags are changed, diff3 will do the > right thing. > > -- > > Greg A. Woods > > +1 416 218-0098; <[EMAIL PROTECTED]>; <[EMAIL PROTECTED]>; > <[EMAIL PROTECTED]> > Planix, Inc. <[EMAIL PROTECTED]>; VE3TCP; Secrets of the Weird > <[EMAIL PROTECTED]> > > _______________________________________________ > Info-cvs mailing list > [EMAIL PROTECTED] > http://mail.gnu.org/mailman/listinfo/info-cvs > _______________________________________________ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
