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.
Hmm,
you need to explain more what your question is really about...
In CVS the actions are:
cvs checkout will retrieve the module files from the server
- Then the developer edits files
cvs commit will send back the changes to the server *with comment*
if another developer has committed a change while you are editing the
file yourself then you must first do a cvs update before you can
cvs commit your own changes.
The update is the process where the merge will happen and it will be
completely transparent, no messages need to be entered or read.
So, please explain what you mean by your question.
/Bo
-----Original Message-----
From: cvsnt-bounces at cvsnt.org [mailto:cvsnt-bounces at cvsnt.org]On Behalf
Of ari
Sent: den 17 januari 2005 13:52
To: cvsnt at cvsnt.org cvsnt downloads at march-hare.com @CVSNT on Twitter CVSNT on Facebook
Subject: [cvsnt] how to control the update action merger the new change
tolocal file without any comments?
hi all,
When I try to change my version control server from VSS to CVS, I found
some problems.
I have some file types that just can be mergered without comment(such as
*.dfm -- one of delphi's source file types).
So, my question is how to update and merger the changed to local file
without any comments? The file must be mergered the remote and local change
like "Text file" without comment.
I used CVSNT 2.0.58d and WinCVS 13b21-2!
Regards,
Ari
_______________________________________________
cvsnt mailing list
cvsnt at cvsnt.org cvsnt downloads at march-hare.com @CVSNT on Twitter CVSNT on Facebook
http://www.cvsnt.org/cgi-bin/mailman/listinfo/cvsnt https://www.march-hare.com/cvspro/en.asp#downcvs