[cvsnt] Merge doesn't remove file

[Gerhard Fiedler]

Flávio Etrusco wrote:

> On Thu, Mar 13, 2008 at 9:51 AM, Gerhard Fiedler
> <lists at connectionbrazil.com> wrote:
>> I have a file that has been removed on a branch, but when I merge that
>> branch into HEAD, the file on HEAD doesn't get removed. Instead, I get
>> a message that says "cvs server: file Base.hpp has been modified, but
>> has been removed in revision bGeDev". (See the update command below.) 
>> 
>> The file is not modified on HEAD (see stat below). The only
>> modifications are a few revisions on the branch after the last merge
>> before the file got removed on the branch. But the last revision on the
>> branch is dead (see log below). Yet, after the merge, the file in HEAD
>> is untouched. 
>> 
>> Can anybody explain why it doesn't merge the remove from the branch to
>> HEAD?
> 
> I guess the message refers to the fact that there were
> commits/modifications on head after the branchpoint/last mergepoint?

That would be understandable, but there aren't any modifications to the
file on HEAD after the last merge point. (See my response to Tony for
details.)

Gerhard