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.
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. ___________________________________________________________________________