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.
Here is the command that WinCvs generated as shown in the command window: cvs -z9 import -d -I ! -I CVS -m "Importing the WMC3 sources version 1.8" -n WMT/WM3 (in directory C:\3RProj\HW\WMT\Roger\wm3-1.8) And I am not using any branches, this is because these sources are supposed to build a proper module with a progressive revision history on TRUNK rather than creating multiple branches... And I want to preserve the original file timestamps too. /Bo -----Original Message----- From: Mike Wake [mailto:mike.wake at thales-tts.com] Sent: den 23 november 2004 13:19 To: Bo Berglund Cc: CVS-NT Mailing list (E-mail) Subject: Re: [cvsnt] Import generates conflict messages, why??? Hi Bo, What was the command used by WinCVS to do the import? Could it have something to do with needing to increment the Vender and/or Release Tags? Cheers Mikew Bo Berglund wrote: > I am testing how to get existing unix sources into cvs with things like file dates intact. > So I am using cvs import (from WinCvs) to repeatedly import file sets into the same > module on the server. The file sets are source versions kept in separate folders in > the original development computer. Each folder contains both modified and unmodified > files as compared to the previous version. > > What I tried is this: > 1) Import the first folder into a new module. > I used the option to use the filedate as the date of import and I did not create > any vendor branch etc. > > 2) Then I checked out the module to have a look and all was well concerning file dates > > 3) Then I moved on to the next source folder where most files were the same as before > but a handful had changed. I repeated the same command again to import these files > to the same module. > > What happens now is a bit mysterious to me, CVSNT outputs a conflict message on each > file that has changed but nothing on the files that did not change. > > When I check out the module again I get the changed files as revision 1.2 as I expected > and there seems to be no problems concerning the file contents either. > > So why is CVSNT sending this conflict message? The files are simply edited and there is > a new revision to put into CVS only, this should not trigger a conflict, should it??? > > Client: Concurrent Versions System (CVSNT) 2.0.41a (client/server) > Server: Concurrent Versions System (CVSNT) 2.0.41 (client/server) > > Best regards, > > Bo Berglund > _______________________________________________ > 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