cvs diffs wrong + doc merge proposal + branching gripe

[Thien-Thi Nguyen]

probably i'm not the first to notice this, but has anyone got a clue on
how to make correct the cvs diffs sent to guile-cvs mailing list?  it
seems the branching has confused some script mightily.

in other news, i've started to make small changes in the doc subdir for
1.6 branch.  rather than laboriously trying to sync every change w/ the
main branch, i'm in favor of one big merge at the end (at least for
docs), around release time.  any objections?  i suppose this approach
can be used generally, not just for docs (e.g., the examples/ "make
check" support).

i think branching has been more trouble than its worth, unfortunately.
it seems there hasn't been enough parallel development on the main
branch to warrant branching in the first place.  maybe next time we can
keep it simple and avoid branching altogether?  the cost, requiring a
delay in "main branch" checkins, is not so great if those checkins are
low volume as we are seeing here.

thi