[cvsnt] Unmodified files committed when merging from a branch

Bo Berglund Bo.Berglund at system3r.se
Fri Apr 22 10:33:03 BST 2005


I think this is because there *is* a subtle modification regardless,
the mergepoint needs to be committed.
But then again if no merge took place (result of merge is same as
base revision) then no mergepoint is really needed...
Maybe Tony can explain...

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 22 april 2005 09:44
To: cvsnt at cvsnt.org
Subject: [cvsnt] Unmodified files committed when merging from a branch


Hi,

Two weeks ago I merged one of the branches  we have, I will call it
BR1, with the HEAD branch.  Some files that were not modified in BR1
appeared as modified in HEAD after the merge.  I expected that these files
would not be commited, because cvs diff command returns no diferences at
all, but for my suprise, cvsnt committed them. Last week I know that if a
file timestamp is different from the one in the repository it may be marked
as modified, but when committing cvsnt will check the modifications, if
they don't exist cvsnt should not committ the file unless I specifiy that
option.  Why in the case of the merge this is not accomplished.  The
problem is not critic, but when merging I have to check if this rare case
arises to committ these files with a  message that indicates that the file
has not been chaned, so the repository will store revision that shouldn't.

These happens with a few files, our repository stores lots of files, but
only a few show this problem.  I have not found a connection between them
for now. Does somebody knows what the problem is?

I am using CVSNT 2.0.58d as server and WinCVS 1.3.20.2 Beta 20 (build 2).

Thanks a lot.

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
http://www.cvsnt.org/cgi-bin/mailman/listinfo/cvsnt



More information about the cvsnt mailing list