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.
