Follow-up to r1505121:

* build/generator/gen_base.py
  (write_errno_table): Restore a non-obsolete part of a comment.

git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1509559 13f79535-47bb-0310-9956-ffa450edef68
Revert part of r1509137: Remove extended constructors for spillbuf reader
and the spillbuf stream wrapper.

* subversion/include/private/svn_subr_private.h
  (svn_spillbuf__reader_create_extended,
   svn_stream__from_spillbuf_extended): Removed.
* subversion/libsvn_subr/spillbuf.c
  (svn_spillbuf__reader_create_extended,
   svn_stream__from_spillbuf,
   svn_stream__from_spillbuf_extended): Removed.
  (stream_from_reader): Renamed to svn_stream__from_spillbuf.
* subversion/tests/libsvn_subr/spillbuf-test.c
  (test_spillbuf_reader): Renamed from test_spillbuf__reader.
  (test_spillbuf_stream): Renamed from test_spillbuf__stream.
  (test_spillbuf_reader_spill_all,
   test_spillbuf_stream_spill_all): Removed.
  (test_funcs): Deleted obsolete tests.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1509577 13f79535-47bb-0310-9956-ffa450edef68
backport.pl: tweak group names.  Specifically, don't call single-revision
groups "the rN groups"; call them just "rN".

* tools/dist/backport.pl
  (parse_entry): Set ->{header} differently.
  (merge, handle_entry, vote): Track string format change.

git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1509586 13f79535-47bb-0310-9956-ffa450edef68
* tools/dist/backport.pl
  (handle_entry): In the post-merge prompt, don't accept unknown responses.

git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1509587 13f79535-47bb-0310-9956-ffa450edef68
backport.pl: parse "--accept=mc" from "Notes:" headers.

* tools/dist/backport.pl
  (parse_entry): Parse "Notes" headers into a ->{accept} optional member.
    While here, consolidate parsing of "Branch:" and "Depends:" too, since
    the previous lazy solution no longer suffices.
  (handle_entry): Include --accept in the prompt.
  (merge): Include --accept in the log message and 'svn merge' arguments.

git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1509590 13f79535-47bb-0310-9956-ffa450edef68
* tools/dist/backport.pl
  (warning_summary): Rename a variable for clarity.  No functional change.
  (handle_entry): Tweak informational output in conflicts mode.

git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1509598 13f79535-47bb-0310-9956-ffa450edef68
* tools/dist/backport.pl
  (POSIX::strftime): Import.
  (merge): Give the tempfiles more useful names.

git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1509611 13f79535-47bb-0310-9956-ffa450edef68
backport.pl: guard against ambiguous --accept specifications.

* tools/dist/backport.pl
  (parse_entry): Detect multiple --accept specifications, warn about them,
    and ignore the conflicting values (so that the merge, later on, will
    conflict).

git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1509649 13f79535-47bb-0310-9956-ffa450edef68
On the fsx branch: final sync with /trunk.
Conflicts in spillbuf.c and spillbuf-test.c resolved.

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/fsx@1509911 13f79535-47bb-0310-9956-ffa450edef68