On Thu, Jan 24, 2002 at 10:25:38AM +0200, Martti Kuparinen wrote:
  | 
  | Module Name:	basesrc
  | Committed By:	martti
  | Date:		Thu Jan 24 08:25:38 UTC 2002
  | 
  | Removed Files:
  | 	basesrc/dist/ipf: ip_lfil.c ip_sfil.c
  | 
  | Log Message:
  | This file is not needed

Hi Martti.

What steps did you perform after the import to update the head with
the changes between the vendor branches?

Whenever you want to update the head, the best way is something like:
	cvs checkout -j previous-vendor-version -j this-vendor-version ...
rather than what CVS suggested:
	cvs checkout -jDARRENR:yesterday -jDARRENR syssrc

If you perform the former, cvs will automatically tag files removed in
the newer version for deletion and tag newly added files for addition,
and also performs a much cleaner merge. In this case, the command
would have been:
	cvs checkout -j v3-4-16 -j v3-4-23 basesrc/dist/ipf


It is unfortunate that cvs suggests the "-jVENDOR:yesterday -jVENDOR"
options, because that ends up causing more hassle than it's worth.


This trick is covered in
	http://www.mewburn.net/luke/papers/3rdparty-and-cvs.html
Look for "Updating an existing package"

Luke.