- for some short time (until libsysio is also merged) some branches will
  check out the wrong libsysio.  Should be fixed before it is noticed.

land1.sh) to ensure we use the ChangeLog file at the top of the module.
This is needed when trying to land only a subdirectory of a module.

Put only the filenames into the cvs-merge-conflicts file, so that
vi `cat cvs-merge-conflicts` works.

Fix error messages.

CVS/Repository, but we only want the basename.

- b1_4 is basically the parent of HEAD, because that's the direction
  that changes flow, as strange as that sounds.  so there's a
  HEAD_BASE tag which sits on b1_4

b_cmobd_merge should not be used for any further development or testing!

cMD_PRE_CMD_SMASH are the relevant tags.

The pre-smashing contents of HEAD will be committed by yury into b_cmd as a
merge of the two branches.  These will be stabilized on b_cmd and eventually
landed onto HEAD.

b=2094, b=3138, b=3335, b=3274, b=3293, b=2862, b=3147, b=2350, b=3313
b=3265, b=3315, b=3301, b=3325, b=3329, b=3125, b=3098

b=2733, b=2773, b=2529, b=2730, b=2819, b=2814, b=2822, b=1450, b=2676, b=2681
b=2817, b=2706, b=2816, b=1987, b=2884, b=1191, b=2809, b=2765, b=2805, b=1972