On the windows-build-update: Add branch readme file and checkpoint current
minimal prototype of the build generator changes.

* BRANCH-README: New.

* gen-make.py: Accept new option --with-deps-package.
   Based on that, select a differend build generator.
   Print a number of warnings related to option usage.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1436512 13f79535-47bb-0310-9956-ffa450edef68
Revert r1436512 ... wrong branch.

git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1436513 13f79535-47bb-0310-9956-ffa450edef68
Add regression test for issues #3332, #3333.

* subversion/tests/cmdline/switch_tests.py
  (switch_to_spaces): New function.
  (test_list): Add switch_to_spaces.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1436514 13f79535-47bb-0310-9956-ffa450edef68
* subversion/tests/cmdline/patch_tests.py
  (patch_empty_file): Add new XFail test for issue #3644.
  (test_list): Added test.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1436529 13f79535-47bb-0310-9956-ffa450edef68
* subversion/libsvn_subr/io.c
  (svn_io_stat_dirent2): Most likely fix this code for MAC OS, where
     the stat call returned APR_INCOMPLETE.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1436549 13f79535-47bb-0310-9956-ffa450edef68
Fix issue #4298 "'svn sw' with add on unversioned segfaults".

* subversion/libsvn_wc/conflicts.c
  (svn_wc__read_conflicts): Follow-up to r1432454, use the correct pool
   when allocating svn_wc_conflict_description2_t.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1436564 13f79535-47bb-0310-9956-ffa450edef68
* subversion/libsvn_client/patch.c
  (readline): Add assertion.
  (get_hunk_info): Allow matching the empty file with a hunk referring to an
    empty (or not existing) file.

* subversion/tests/cmdline/patch_tests.py
  (patch_empty_file): Extend test to also cover some related cases: no file
    and a single newline file. Update current status.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1436580 13f79535-47bb-0310-9956-ffa450edef68
Follow-up to r1435758: Unbreak BDB tests.

* subversion/tests/cmdline/svnadmin_tests.py
  (verify_windows_paths_in_repos): expect different output for BDB and FSFS

git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1436585 13f79535-47bb-0310-9956-ffa450edef68
Update the expectations of the issue #3644 test, to assume the patch is applied
ok. Verify the final result.

* subversion/svn/notify.c
  (notify): Don't show an offset when patching the empty file.

* subversion/tests/cmdline/patch_tests.py
  (patch_empty_file): Remove XFail marker. Expect applied hunk. Verify disk.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1436592 13f79535-47bb-0310-9956-ffa450edef68
* subversion/tests/cmdline/patch_tests.py
  (patch_change_symlink_target): Verify all commit output in an attempt to
    diagnose an error on some systems.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1436605 13f79535-47bb-0310-9956-ffa450edef68
* subversion/tests/cmdline/patch_tests.py
  (patch_change_symlink_target): Make the length after applying the patch different to
    that before in order not to rely on the timestamps changing between setting and
    reading back.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1436612 13f79535-47bb-0310-9956-ffa450edef68
Followup to r1436580: Add a const to silence a compiler warning.

* subversion/libsvn_client/patch.c
  (get_hunk_info): Constify a variable.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1436622 13f79535-47bb-0310-9956-ffa450edef68
Document the two meanings of 'ignore_ancestry' in libsvn_client merge code.

* subversion/include/svn_client.h
  (svn_client_merge4): Document both meanings. (This doc string also applies,
    by reference, to svn_client_merge_peg4().)

* subversion/libsvn_client/merge.c
  (merge_cmd_baton_t): Document both meanings, briefly.
  (do_file_merge): Update a comment.
  (do_merge): Document both meanings, more fully.
  (merge_locked, merge_peg_locked): Refer to the doc string of do_merge().


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1436636 13f79535-47bb-0310-9956-ffa450edef68
* subversion/svn/merge-cmd.c
  (svn_cl__merge): If the user provides an explicit merge target, use it. Until
    this patch the '.' was taken as no target provided, and the target might just
    decide to merge into a child instead.

* subversion/tests/cmdline/merge_tests.py
  (merge_target_selection): Test target selection handling.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1436652 13f79535-47bb-0310-9956-ffa450edef68
* subversion/tests/cmdline/merge_tests.py
  (merge_target_selection): Extend test with another bad target.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1436658 13f79535-47bb-0310-9956-ffa450edef68
Drive the merge handling based on the source type instead of the target type,
to avoid nasty ra errors and to properly handle merge conflicts when applying
the changes from (src1:src2) upon the specified target.

We document merge as applying the diff between two locations to the target and
this patch makes sure we drive the diff that way.

* subversion/libsvn_client/merge.c
  (do_merge): Drive merge based on source type, instead of based on target
    type.

* subversion/tests/cmdline/merge_tests.py
  (merge_target_selection): Update expected results when using invalid targets.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1436677 13f79535-47bb-0310-9956-ffa450edef68
* subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout
  (svn_cl__cmd_table): Document more precisly the '--ignore-ancestry' and
    '--notice-ancestry' options.

* subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout
  Update the expected help output.

git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1436682 13f79535-47bb-0310-9956-ffa450edef68
* subversion/tests/cmdline/merge_tests.py
  (merge_target_selection): Ensure that the filesize changes to avoid missing
    changes during status walking with sleeps disabled.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1436687 13f79535-47bb-0310-9956-ffa450edef68
Resolve issue #3378, by using a bit more of the WC-NG power. We now only
delete locks when switching to a new location.

This makes the original locks re-appear when switching back to the original
location.

* subversion/libsvn_wc/update_editor.c
  (close_file): Don't delete locks when switching.

* subversion/tests/cmdline/lock_tests.py
  (lock_multi_wc): New test, verify (un)locking of paths in multiple WCs at
    one. (Issue #3105)
  (locks_stick_over_switch): Verify lock handling during switching.
    (issue #3378)


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1436694 13f79535-47bb-0310-9956-ffa450edef68
* subversion/libsvn_wc/update_editor.c
  (close_file): Following up on r1436694, remove SVN_DBG() call.


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