Version Control With Subversion Source

Last of the chapter 4 review and update for 1.8 (for now at
least; the ongoing local move work might necessitate further
changes).

* en/book/ch04-branching-and-merging.xml

(svn.branchmerge.advanced.moves): Use sample repos for
example and fix the example -- what is described produces
a tree conflict, not a clean merge!

(svn.branchmerge.advanced.pre1.5clients): Rename a section
title, all clients are merge aware, it's *merge tracking*
awareness that we care about here.

(svn.branchmerge.advanced.finalword): Back off on the "merge
tracking is a nightmare" tone, while still admitting it can
be tricky. Add a final warning about violating best practices.

(svn.branchmerge.maint.lifetime): Tweak examples to use the sample
repos. Add an example of what to do if your WCs cwd is deleted
during an update. Use repos relative URLs. Use the term
'cherrypick' in place of 'port'.

(svn.branchmerge.commonpatterns.release): Use the term
'cherrypick' in place of 'port'.

(svn.branchmerge.commonpatterns.feature): Use the new "automatic"
merge terminology.

(svn.branchmerge.summary.tbl-1): Remove the deprecated --reintegrate
option from the summary table.

More chapter 4 review and update for 1.8.

* en/book/ch04-branching-and-merging.xml

(svn.branchmerge.using.create): Correct a type in an example
and replace

(svn.branchmerge.basicmerging.stayinsync): Tweak definition of
automatic merging and add it to the index.

(svn.branchmerge.basicmerging.reintegrate): Add 'reintegrate merge'
to the index.

(svn.branchmerge.advanced.advancedsyntax): Use the term automatic
merge' where appropriate. Add 2-URL merge' to the index.

(svn.branchmerge.advanced.mergeconflicts): Wording tweaks and change
examples to use forthcoming ch 4 sample repos.

(svn.branchmerge.advanced.blockchanges): Change examples to use
forthcoming ch 4 sample repos and add example of --ignore-ancestry
merge.

(svn.branchmerge.advanced.reintegratetwice): Remove this section, it
doesn't apply to 1.8.

(svn.branchmerge.advanced.logblame): Update examples using sample repos.

(svn.branchmerge.advanced.ancestry): Add 'merge tracking, disabling'
to index.

* en/book/ch04-branching-and-merging.xml: Properly close <command> tag to
fix a build error. The error I got was:
book/ch04-branching-and-merging.xml:2051: parser error :
Opening and ending tag mismatch: command line 2050 and para
as "eligible" to merge, because it's already been merged:</para>

More chapter 4 review and update for 1.8.

* en/book/ch04-branching-and-merging.xml

(svn.branchmerge.basicmerging.resurrect,
svn.branchmerge.cherrypicking): Update the examples to use the
forthcoming ch 4 sample repository and make some minor
wording and example tweaks.

More chapter 4 review and update for 1.8.

* en/book/ch04-branching-and-merging.xml

(svn.branchmerge.basicmerging.undo): Update to use forthcoming
ch 4 sample repository.

More chapter 4 review and update for 1.8.

* en/book/ch04-branching-and-merging.xml

(svn.branchmerge.basicmerging.reintegrate): Put an ellipse in the
example where we delete a branch. We only say you can delete,
you don't need to in 1.8 to reuse it and we are not doing so in
our ongoing ch 4 example.

(svn.branchmerge.basicmerging.mergeinfo): Rework examples to use
the forthcoming ch 4 sample repository, adjust prose to reflect
1.8 behavior, and make a few wording tweaks.

(svn.branchmerge.basicmerging.mergeinfo.operativerevs): New sidebar.

* en/book/ch04-branching-and-merging.xml
(svn.branchmerge.basicmerging.reintegrate): Fix typo in example.

More chapter 4 review and update for 1.8.

* en/book/ch04-branching-and-merging.xml
(svn.branchmerge.basicmerging.reintegrate): Account for deprecation
of the reintegrate option and use the forthcoming sample repository
for the examples.

More chapter 4 review and update for 1.8.

* en/book/ch04-branching-and-merging.xml

(svn.branchmerge.basicmerging.mergetracking): Minor working tweak,
it's not just for bug fixes that we want a 1.8 client.

(svn.branchmerge.basicmerging.stayinsync): Introduce the
new-in-1.8 terminology of "automatic" merges. Update examples
to use forthcoming ch4 demo repository.

(Keeping a Branch in Sync Without Merge Tracking): Redo the
examples in this sidebar to use an old (1.4.6) client and the
demo repository. The examples still work fine with a 1.5+ client
but the 1.4 client better keeps less hidden and (IMHO) makes for
a better example.

(Why Not Use Patches Instead?): Use demo repository in this sidebar's
examples.

(svn.branchmerge.basicmerging.stayinsync.subtree): Tweak some awkward
wording.

Rest of ticket #321 and beginning of ticket #322 (cf.
http://www.svnbook.de/ticket/321 and
http://www.svnbook.de/ticket/322).