[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

RE: merge mode for XML

From: Sean Hager
Subject: RE: merge mode for XML
Date: Fri, 26 Apr 2002 08:16:44 -0500

> -----Original Message-----
> From: address@hidden 
> [mailto:address@hidden Behalf Of
> Greg A. Woods
> Sent: Thursday, April 25, 2002 8:24 PM
> To: address@hidden
> Cc: CVS-II Discussion Mailing List
> 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

I did test the merge with xml files and it worked fine
as long as we made edits more then 5 to 10 lines appart from each other. 

When we made edits that were only 1 or 2 lines appart we got conflicts
which I felt the merge should have been able to solve.

I am not a CVS expert, but I was thinking that perhaps the tags
diff3 was looking for were different for xml.  I am going to test it
some more, prehaps I will have to look into the source code, but I 
was hoping someone on the list had some experience with this.


reply via email to

[Prev in Thread] Current Thread [Next in Thread]