------------------------------------------------------------------------
r39834 | hwright | 2009-10-07 21:51:50 +0530 (Wed, 07 Oct 2009) | 16 lines
Changed paths:
   M /branches/1.6.x
   M /branches/1.6.x/CHANGES
   M /branches/1.6.x/STATUS
   M /branches/1.6.x/subversion/libsvn_client/add.c
   M /branches/1.6.x/subversion/tests/cmdline/autoprop_tests.py

Reintegrate the 1.6.x-r39557 branch:

 * r39557
   Fix issue #2713: When adding a file with auto-props setting svn:eol-style,
     if it had inconsistent line endings, svn added it and then aborted without
     setting all of its properties. Instead, abort without adding the file.
   Justification:
     The fix makes it easier to add a large set of files, by removing a
     considerable annoyance. The fix is small and has a regression test.
   Branch:
     Uses adm_access instead of wc_ctx, so svn_wc_revert3() instead of
     svn_wc_revert4().
     ^/branches/1.6.x-r39557
  Votes:
    +1: julianfoad, arfrever, rhuijben

------------------------------------------------------------------------
r39595 | julianfoad | 2009-09-25 15:07:52 +0530 (Fri, 25 Sep 2009) | 20 lines
Changed paths:
   M /branches/1.6.x-r39557
   M /branches/1.6.x-r39557/subversion/libsvn_client/add.c
   M /branches/1.6.x-r39557/subversion/tests/cmdline/autoprop_tests.py
Merged via: r39834

On ^/branches/1.6.x-r39557:
Merge r39557 from trunk, adjusting for 1.6 APIs.

Here is a copy of r39557's log message, which is still applicable:

  Fix issue #2713, "add --auto-props, adds file with mixed eol then aborts".

  When adding a file with mixed EOL style, with auto-props setting
  svn:eol-style, svn treats this as an error and aborts. Previously, it marked
  the file for addition and applied an indeterminate subset of the auto-props
  before aborting. Instead, if any auto-prop setting fails, abort without
  marking the file for addition.

  * subversion/libsvn_client/add.c
    (add_file): If we fail to set a property on the added file, revert the add.

  * subversion/tests/cmdline/autoprop_tests.py
    (fail_add_mixed_eol_style): New test.
    (test_list): Add the new test.

------------------------------------------------------------------------
r39557 | julianfoad | 2009-09-24 16:53:52 +0530 (Thu, 24 Sep 2009) | 15 lines
Changed paths:
   M /trunk/subversion/libsvn_client/add.c
   M /trunk/subversion/tests/cmdline/autoprop_tests.py
Merged via: r39834, r39595

Fix issue #2713, "add --auto-props, adds file with mixed eol then aborts".

When adding a file with mixed EOL style, with auto-props setting svn:eol-style,
svn treats this as an error and aborts. Previously, it marked the file for
addition and applied an indeterminate subset of the auto-props before aborting.
Instead, if any auto-prop setting fails, abort without marking the file for
addition.

* subversion/libsvn_client/add.c
  (add_file): If we fail to set a property on the added file, revert the add.

* subversion/tests/cmdline/autoprop_tests.py
  (fail_add_mixed_eol_style): New test.
  (test_list): Add the new test.

------------------------------------------------------------------------
r39594 | julianfoad | 2009-09-25 14:55:27 +0530 (Fri, 25 Sep 2009) | 2 lines
Changed paths:
   A /branches/1.6.x-r39557 (from /branches/1.6.x:39593)
Merged via: r39834

* ^/branches/1.6.x-r39557: New branch for back-port of r39557.

------------------------------------------------------------------------
r39557 | julianfoad | 2009-09-24 16:53:52 +0530 (Thu, 24 Sep 2009) | 15 lines
Changed paths:
   M /trunk/subversion/libsvn_client/add.c
   M /trunk/subversion/tests/cmdline/autoprop_tests.py
Merged via: r39834

Fix issue #2713, "add --auto-props, adds file with mixed eol then aborts".

When adding a file with mixed EOL style, with auto-props setting svn:eol-style,
svn treats this as an error and aborts. Previously, it marked the file for
addition and applied an indeterminate subset of the auto-props before aborting.
Instead, if any auto-prop setting fails, abort without marking the file for
addition.

* subversion/libsvn_client/add.c
  (add_file): If we fail to set a property on the added file, revert the add.

* subversion/tests/cmdline/autoprop_tests.py
  (fail_add_mixed_eol_style): New test.
  (test_list): Add the new test.

------------------------------------------------------------------------