[cvsnt] Merging Files and Diffs?

Richard Kerry Richard.Kerry at bbc.co.uk
Wed Jul 27 15:39:51 BST 2005

Community technical support mailing list was retired 2010 and replaced with a professional technical support team. For assistance please contact: Pre-sales Technical support via email to sales@march-hare.com.

Supplementary question about Mergeing.

Is all the mergeing during Update done by CVSNT's internal merge handler
?  Or can it be requested to use an external utility ?

I'm asking this as some of my users have indicated that its handling of
xml files is not always as we would wish.  Some of the xml handling
tools that we are using have a habit of reorganizing the file.  This
doesn't affect the programs using the data but can and does affect cvs's
ability to do a merge properly.  When our tool has moved a block, the
merge may reinstate it in the old place.  This can causes duplication of
a block.


PS.  Yes, we should also consider changing our tools so they don't move
around the blocks.  That's a different issue.
PPS.  Apologies as usual if my employer's systems add a load of
signature text.


This e-mail (and any attachments) is confidential and may contain
personal views which are not the views of the BBC unless specifically
If you have received it in error, please delete it from your system. 
Do not use, copy or disclose the information in any way nor act in
reliance on it and notify the sender immediately. Please note that the
BBC monitors e-mails sent or received. 
Further communication will signify your consent to this.

More information about the cvsnt mailing list
Download the latest CVSNT, TortosieCVS, WinCVS etc. for Windows 8 etc.
@CVSNT on Twitter   CVSNT on Facebook