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.
I think that the file in question was actually added on the branch and then later merged to HEAD. Probably as the result of an import. Can be seen from the revision numbers 1.1.1.1 versus 1.2 In order to do a merge to HEAD of a file initially added on a branch the CVSNT server stores admin data in the repository file such as the new revision and most importantly the mergepoint info that later makes it possible to see from where the file came. So the file *is* modified, but it is not the file *contents* that has changed, rather it is the file context that changed. To store this properly the CVS server needs to create the new revision. Please note that you can force CVSNT *not* to create the vendor branch for imports, there are command switches for that purpose (also exposed in the WinCvs GUI application). If you use these then the imported revision will become 1.1 and there will never be a need for merging to TRUNK and thus not any extra revisions either.... /Bo -----Original Message----- From: cvsnt-bounces at cvsnt.org [mailto:cvsnt-bounces at cvsnt.org]On Behalf Of jacob.alvarezbenedicto at telefonica.es Sent: den 26 april 2005 11:13 To: cvsnt at cvsnt.org cvsnt downloads at march-hare.com @CVSNT on Twitter CVSNT on Facebook Subject: [cvsnt] Re: Unmodified files committed when merging from a branch Hi, I include some logs of one the file that were unmodified in the merge, but commited. I have diffed them with the CVS diff, and other diffing programs, and they are identical. Any ideas ?? *********************************************************************************************** This is part of the log for the revision before the merge ---------------------------- Revision : 1.2 Date : 2005/3/14 10:52:24 Author : 'htx0290' State : 'Exp' Lines : +3 -1 Keyword : 'kv' CommitID : 'fc42356ce73128' Description : filename: Ifr_SubHojas.asp; Enrique: RF.GEN.03.11 Asignación automática de ECL en la Subhoja. This is part of the log for the revision after the merge ---------------------------- Revision : 1.3 Date : 2005/3/15 11:20:36 Author : 'htb0202' State : 'Exp' Lines : +0 0 Keyword : 'kv' CommitID : 'd744236c50114d9' MergePoint : '1.1.1.1' Description : filename: Ifr_SubHojas.asp; Jacob: Integracion 3.3.14. Ficheros no modificados This is the result of the cvs diff that shows no differences between revisions. ----------------------------------------------------------------------------------------- cvs diff -r 1.2 -r 1.3 Ifr_SubHojas.asp Ifr_SubHojas.asp (in directory C: \Copias Locales CVS\Head\Filon\portales\FilonWeb\Adjudicacion\) Index: Ifr_SubHojas.asp =================================================================== RCS file: /Repositorio_Filon/Filon/portales/FilonWeb/Adjudicacion/Ifr_SubHojas.asp,v retrieving revision 1.2 retrieving revision 1.3 diff -r1.2 -r1.3 ***** CVS exited normally with code 0 ***** ******************************************************************************************************************* Thanks, Jacob ___________________________________________________________________________ Este mensaje se dirige exclusivamente a su destinatario y puede contener información privilegiada o confidencial. Si no es vd. el destinatario indicado, queda notificado de que la utilización, divulgación y/o copia sin autorización está prohibida en virtud de la legislación vigente. Si ha recibido este mensaje por error, le rogamos que nos lo comunique inmediatamente por esta misma vía y proceda a su destrucción. This message is intended exclusively for its addressee and may contain information that is CONFIDENTIAL and protected by professional privilege. If you are not the intended recipient you are hereby notified that any dissemination, copy or disclosure of this communication is strictly prohibited by law. If this message has been received in error, please immediately notify us via e-mail and delete it. ___________________________________________________________________________ _______________________________________________ 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