In article <199705062150.OAA11926@delta.ghs.com> you write:
> Sorry about the cross-post, this _is_ just a reply.
> The solution is to anticipate a release and split the code off into the
> release branch and the development branch. Bug _fixes_ (at least, those
> that don't include major rewrites) go into _both_ branches. You should

But this wouldn't help him, in that case -- poll() is either a new
feature of a major rewrite bugfix, depending on your point of view, but
it wouldn't go into 1.2.1 in any case.