Version Control With Subversion Source

Follow-up to r4158: Give fair warning of the *actual* problem!

* en/book/ch04-branching-and-merging.xml
(svn.branchemerge.basicmerging.reintegrate): Footnote more 1.7's
more permissive attitude towards shallow targets, but give fair
warning of potential problems.

* en/book/ch04-branching-and-merging.xml
(svn.branchemerge.basicmerging.reintegrate): Footnote more 1.7's
more permissive attitude towards shallow targets, but give fair
warning of potential problems.

* en/book/ch04-branching-and-merging.xml
(svn.branchemerge.basicmerging.reintegrate): Mention reintegrate's
increased flexibility re subtree merges in 1.7, but do it in
a footnote; this is really not something we want to encourage
(though apparently some folks like to work this way).

Add myself to COMMITTERS

* en/book/ch04-branching-and-merging.xml
(svn.branchmerge.basicmerging.mergeinfo): Describe how
'svn mergeinfo' handles non-inheritable mergeinfo and subtree
mergeinfo in 1.7.

* en/book/ch04-branching-and-merging.xml
(svn.branchmerge.basicmerging.mergeinfo.inheritance): Fix a typo
and some incorrect output in the sidebar on mergeinfo inheritance.

* en/book/ch04-branching-and-merging.xml
(svn.branchmerge.basicmerging.mergeinfo): Add a tip on viewing
large amounts of mergeinfo (I'm always shocked by how many
people don't know the benefit of -v).

* COMMITTERS: Add myself.

* en/book/ch04-branching-and-merging.xml
More general edits while reading through.

Rework chapter 4's introduction.