[cvsnt] WAS: merge error/feature when merging to branch and back

[Bo Berglund]

Funnily I was hit by the same "bug" yesterday when struggling with a module that compiled
but threw off exceptions when running.

After some time I decided to check the files and I found 3 that should not even be there!
Deleting them caused the compiler (Delphi) to pick them up from the correct place in the
component directory instead and the compilation created sane code again.

It turned out that some 16 months ago the module contained *copies* of the component files
and it was discovered then and the files were cvs removed.

But at the same time there was a branch active started before the removal and when this
branch was later merged to TRUNK the 3 files reappeared even though they had been removed!

So I am also wondering about how this is supposed to work. 


Best regards,

Bo Berglund


-----Original Message-----
From: cvsnt-bounces at cvsnt.org [mailto:cvsnt-bounces at cvsnt.org] On Behalf Of Flávio Etrusco
Sent: den 25 november 2005 14:07
Cc: cvsnt at cvsnt.org
Subject: Re: [cvsnt] WAS: merge error/feature when merging to branch and back

While we're still on the subject, did cvs(nt) ever handled ignoring
files that were cvs-removed on the trunk?
I mean, currently if you branch (a module) and then cvs-remove a file
on the trunk, when you merge the branch back to the trunk the file
will be cvs-added.
Has this ever worked correctly or am I delirious?

Regards,
Flávio
_______________________________________________
cvsnt mailing list
cvsnt at cvsnt.org
http://www.cvsnt.org/cgi-bin/mailman/listinfo/cvsnt