automated/assisted merging of XML files

Patrice Chalin chalin at cse.concordia.ca
Wed Oct 11 11:19:01 CDT 2006


Hi,

Using the automated merge capabilities of CVS can corrupt XML files.  I 
noticed that you maintain the DocBook source for the SVN book under Trac 
using SVN, hence you must have run into this problem of mering XML 
files.  How do you handle automated/assisted merging of XML files?  Do 
you use a tool like Harmony <http://www.seas.upenn.edu/%7Eharmony/>?

Thanks,
Patrice

p.s. This is a resend as my first e-mail seems to have been silently 
discarded.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://www.red-bean.com/pipermail/svnbook-dev/attachments/20061011/fd53af6b/attachment-0001.html>


More information about the svnbook-dev mailing list