automated/assisted merging of XML files

Baptiste MATHUS ml at batmat.net
Sun Oct 15 15:24:58 CDT 2006


Hi,

Although it's very kind of you to want to help others, could you
please try to stop polluting this list with three times the same
message :
* http://www.red-bean.com/pipermail/svnbook-dev/2006-October/002559.html
* http://www.red-bean.com/pipermail/svnbook-dev/2006-October/002546.html
* this one

Moreover, C. Michael Pilato already answered you last time...
(http://www.red-bean.com/pipermail/svnbook-dev/2006-October/002547.html)

Thanks a lot.

2006/10/11, Patrice Chalin <chalin at cse.concordia.ca>:
>
>  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?
>
>  Thanks,
>  Patrice
>

-- 
Baptiste <Batmat> Mathus
BMathus at Batmat point net - http://batmat.net
---------
Si chacun de nous a une idée et que nous les partageons, nous
repartirons tous les deux avec deux idées... C'est ça le Libre.




More information about the svnbook-dev mailing list