Version Control With Subversion Source

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).

* en/book/images/basic-branch.odg
* en/book/images/basic-branch.png
Resize this graphic to 4.81" x 2.18" at 120dpi and use FreeSans
rather than Arial.

* en/book/ch04-branching-and-merging.xml
(svn.branchmerge.using.work.dia-1): Update graphic tag as
per above.

* en/book/images/svn-arch-diagram.odg,
* en/book/images/svn-arch-diagram.png
Resize this graphic to 5" x 6.25".

* en/book/ch00-preface.xml
Update graphic reference.

* en/HACKING
Get specific about image creation.

Followup to r4439, fixing some build breakage.

* en/book/ch04-branching-and-merging.xml
A missing whitespace in XML tag.

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

(svn.branchmerge.using.create): Use '^' notation in branch creation
command line example.

(svn.branchmerge.using.work): Use a slightly more complicated branching
example that follows along with a sample repository I'm creating for
this chapter. Point to the new png diagram below.

* en/book/images/basic-branch.odg: New source file for the revised png
below. Note that I couldn't find the FreeSans font for Windows, so I
used Arial. I'll need to edit this and any additional diagrams I revise
later on a linux box (which I'm assuming I can find FreeSans for).

* en/book/images/ch04dia4.png: Deleted and replaced with...

* en/book/images/basic-branch.png: ...this.