Version Control With Subversion Source

Some pictures for svnbook (russian)

Patch contributed by Mason Thomas, with minor tweaks. Issue 1217.

* doc/book/book/ch01.xml: correct typos and improve English usage.

Follow-up to r6597:

* doc/book/book/ch03.xml, doc/book/book/ch06.xml, doc/book/book/ch08.xml
* doc/book/book/appa.xml, doc/book/outline.txt
* doc/translations/french/client.texi, doc/user/svn-ref.tex
* tools/client-side/psvn/psvn.el, tools/client-side/vc-svn.el
The command is "resolved" now, not "resolve".

* subversion/include/svn_wc.h
* subversion/libsvn_wc/adm_crawler.c
* subversion/libsvn_wc/adm_ops.c
* subversion/libsvn_client/resolved.c
(svn_wc_resolved_conflict) Replaces svn_wc_resolve_conflict.

Found another way to install FOP.

* README: Who woulda thought?

Make the former '--ignore-ancestry' behavior for diffs and merges the
default, reversing the sense and changing the name of the option to
'--notice-ancestry'.

* subversion/clients/cmdline/cl.h
(svn_cl__notice_ancestry_opt): Was svn_cl__ignore_ancestry_opt.
(svn_cl__opt_state_t): Rename 'ignore_ancestry' to 'notice_ancestry'.

* subversion/clients/cmdline/main.c
(svn_cl__options, svn_cl__cmd_table, main): Track renamed option.

* subversion/clients/cmdline/diff-cmd.c
(svn_cl__diff): Track renamed option (and its sense reversal).

* subversion/clients/cmdline/merge-cmd.c
(svn_cl__merge): Track renamed option (and its sense reversal).

* subversion/tests/clients/cmdline/merge_tests.py
(merge_with_implicit_target): Shorten description.
(test_list): merge_similar_unrelated_trees() is no longer expected
to fail.

* subversion/doc/book/book/ch06.xml
* subversion/doc/book/book/ch08.xml
Track the renamed option.

Rename 'svn resolve' to 'svn resolved':

* subversion/clients/cmdline/main.c
(svn_cl__cmd_table): Change the command name.

* subversion/include/svn_wc.h
(svn_wc_notify_resolved): Replaces svn_wc_notify_resolve.

* subversion/clients/cmdline/feedback.c
(notify): Adjust notification code.

* subversion/libsvn_wc/adm_ops.c
(resolve_conflict_on_entry): Adjust notification.

* subversion/libsvn_client/resolved.c
(svn_client_resolved): Rename file and function, from
resolve.c:svn_client_resolved.

* subversion/clients/cmdline/resolved-cmd.c
(svn_cl__resolved): Rename file and function, from
resolve-cmd.c:svn_cl__resolved.

* subversion/clients/cmdline/cl.h, subversion/include/svn_client.h:
Adjust for above renames.

Tests:

* subversion/tests/clients/cmdline/basic_tests.py
(basic_conflict): Adjust.

* subversion/tests/clients/cmdline/prop_tests.py
(update_conflict_props): Adjust.

* subversion/tests/clients/cmdline/getopt_tests_data/svn_help_stdout,
subversion/tests/clients/cmdline/getopt_tests_data/svn--help_stdout:
Adjust.

Documentation:

* doc/book/book/ch08.xml, subversion/clients/cmdline/man/svn.1: Adjust.

Bindings:

* subversion/bindings/java/javahl/native/SVNClient.cpp
(SVNClient::resolved): Replace SVNClient::resolve, invoke
svn_client_resolved now.

* subversion/bindings/java/javahl/native/org_tigris_subversion_javahl_SVNClient.cpp
(Java_org_tigris_subversion_javahl_SVNClient_resolved): Replaces
Java_org_tigris_subversion_javahl_SVNClient_resolved, etc.

* subversion/bindings/java/javahl/native/Notify.cpp
(Notify::onNotify): Adjust notification action.

* subversion/bindings/java/javahl/native/SVNClient.h
(class SVNClient): The method name is 'resolved' now.

* subversion/bindings/java/javahl/src/org/tigris/subversion/javahl/SVNClient.java
(SVNClient:resolved): Replaces SVNClient:resolve.

* subversion/bindings/java/javahl/src/org/tigris/subversion/javahl/Notify.java
(Notify::onNotify): Use resolved for action code and name.

Book: Correct broken xml formatting pointed out by Julian Foad

* doc/book/book/ch03.xml: Unborkify.

Tweak to get emacs xml-mode goodness working properly in
doc/book/book/*.xml. Explicitly eval local variables.

* doc/book/tools/svnbook.el: Is that an operating system in your
editor, or are you just happy to see me?

Book: Add emacs local variables section which disappeared.

* doc/book/book/ch03.xml: Emacs goodness, no content changes.

Book: Incorporate a number of changes suggested by Gareth McCaughan
<Gareth.McCaughan@...>.

* doc/book/book/ch03.xml: Changes to 'svn status', 'svn diff', and
'svn resolve'