cvsmerge not adding ACLMyPortName.cc to ssl-bump

Hi there,

    When "cvsmerge HEAD" was executed in ssl-bump branch, a few recently
added files were not created and added to the branch. Does anybody know
why and how this can be fixed? The merge was overall successful and the
changes got auto-committed.

For example, src/ACLMyPortName.cc was not added. Cvs status output looks
rather strange -- it says there is no such file but then shows its tags:

> squid3-ssl-bump/src> cvs status -v ACLMyPortName.cc
> ===================================================================
> File: no file ACLMyPortName.cc Status: Unknown
>
> Working revision: No entry for ACLMyPortName.cc
> Repository revision: No revision control file
>
> Existing Tags:
> Z-ssl-bump_merge-old_HEAD (revision: 1.1)
> Z-ssl-bump_merge-new_HEAD (revision: 1.1)
> Z-ssl-bump_merge_HEAD (revision: 1.1)
> Z-async-calls_merge_HEAD (revision: 1.1)
> async-calls (branch: 1.1.12)
> Z-async-calls_merge-new_HEAD (revision: 1.1)
> Z-ayjwork_merge-old_HEAD (revision: 1.1)
> Z-shaga_merge_HEAD (revision: 1.1)
> shaga (branch: 1.1.10)
> Z-nt_merge-old_HEAD (revision: 1.1)
> Z-nt_merge_HEAD (revision: 1.1)
> nt (branch: 1.1.8)
> Z-nt_merge-new_HEAD (revision: 1.1)
> Z-docs_merge-old_HEAD (revision: 1.1)
> Z-ayjwork_merge_HEAD (revision: 1.1)
> ayjwork (branch: 1.1.6)
> Z-ayjwork_merge-new_HEAD (revision: 1.1)
> Z-squid3-ipv6_merge-old_HEAD (revision: 1.1)
> Z-squid3-ipv6_merge_HEAD (revision: 1.1)
> squid3-ipv6 (branch: 1.1.4)
> Z-squid3-ipv6_merge-new_HEAD (revision: 1.1)
> Z-docs_merge_HEAD (revision: 1.1)
> docs (branch: 1.1.2)
> Z-docs_merge-new_HEAD (revision: 1.1)

Any clues?

Thank you,

Alex.
Received on Thu Jan 24 2008 - 23:04:23 MST