WinCVS merge

[Jerry]

Hi all,

We've set up a client-server CVS using Win95 (client CVS v1.2) and
HP-UX 11 (server CVS v1.11.1p1) which is working fine.

We're using CVS in the following way: The main trunk of the repository
on the server represents the client's environment. Each new
development is made on a branch which is then merged into the main
trunk after being moved to production at the client's site.
Bugs in live are directly patched on the main trunk.

My questions:
1. Is there a way to view wether a branch has been merged into the
main trunk ?
2. Can a branch be locked to avoid further updates after having
merging ?

Thanx,
Jerry