svn commit: r1161467 - /subversion/trunk/subversion/include/svn_wc.h

2011-08-25 Thread danielsh
Author: danielsh Date: Thu Aug 25 09:37:02 2011 New Revision: 1161467 URL: http://svn.apache.org/viewvc?rev=1161467view=rev Log: * subversion/include/svn_wc.h (svn_wc_merge4): Document another rationale for a behaviour. Modified: subversion/trunk/subversion/include/svn_wc.h Modified:

svn commit: r1161470 - /subversion/trunk/subversion/include/svn_diff.h

2011-08-25 Thread danielsh
Author: danielsh Date: Thu Aug 25 09:43:25 2011 New Revision: 1161470 URL: http://svn.apache.org/viewvc?rev=1161470view=rev Log: * subversion/include/svn_diff.h (svn_diff_file_options_parse): Document '-p'. Modified: subversion/trunk/subversion/include/svn_diff.h Modified:

svn commit: r1161474 - /subversion/trunk/subversion/libsvn_wc/merge.c

2011-08-25 Thread danielsh
Author: danielsh Date: Thu Aug 25 09:52:31 2011 New Revision: 1161474 URL: http://svn.apache.org/viewvc?rev=1161474view=rev Log: No functional change. * subversion/libsvn_wc/merge.c (svn_wc__internal_merge): Make a temporary parameter rename permanent. Modified:

svn commit: r1161546 - /subversion/branches/1.7.x/STATUS

2011-08-25 Thread philip
Author: philip Date: Thu Aug 25 12:53:33 2011 New Revision: 1161546 URL: http://svn.apache.org/viewvc?rev=1161546view=rev Log: * STATUS: Vote/approve issue 3975 Modified: subversion/branches/1.7.x/STATUS Modified: subversion/branches/1.7.x/STATUS URL:

svn commit: r1161547 - in /subversion/branches/1.7.x: ./ STATUS subversion/libsvn_client/merge.c subversion/tests/cmdline/merge_authz_tests.py subversion/tests/cmdline/merge_reintegrate_tests.py subve

2011-08-25 Thread hwright
Author: hwright Date: Thu Aug 25 12:57:59 2011 New Revision: 1161547 URL: http://svn.apache.org/viewvc?rev=1161547view=rev Log: Reintegrate the 1.7.x-issue3975 branch: * r1152809, r1152267, r1152286, r1160756 Fixes issue #3975 'adds with explicit mergeinfo don't get mergeinfo

svn commit: r1161589 - /subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c

2011-08-25 Thread danielsh
Author: danielsh Date: Thu Aug 25 14:53:47 2011 New Revision: 1161589 URL: http://svn.apache.org/viewvc?rev=1161589view=rev Log: * subversion/libsvn_fs_fs/fs_fs.c (svn_fs_fs__commit): Relocate a comment in anticipation of future extension. Modified:

svn commit: r1161624 - in /subversion/branches/fs-py/subversion: libsvn_fs_py/fs_fs.c python/svn/fs/__init__.py

2011-08-25 Thread hwright
Author: hwright Date: Thu Aug 25 16:12:55 2011 New Revision: 1161624 URL: http://svn.apache.org/viewvc?rev=1161624view=rev Log: On the fs-py branch: Implement FSFS packing in Python. * subversion/python/svn/fs/__init__.py (): A couple new constants. (_write_revnum_file): New.

svn commit: r1161683 - /subversion/trunk/subversion/tests/cmdline/merge_tests.py

2011-08-25 Thread pburba
Author: pburba Date: Thu Aug 25 18:39:43 2011 New Revision: 1161683 URL: http://svn.apache.org/viewvc?rev=1161683view=rev Log: Add a test for issue #3976 'record-only merges which add new subtree mergeinfo don't record mergeinfo describing merge'. * subversion/tests/cmdline/merge_tests.py

svn commit: r1161708 - /subversion/branches/1.7.x/STATUS

2011-08-25 Thread rhuijben
Author: rhuijben Date: Thu Aug 25 19:23:05 2011 New Revision: 1161708 URL: http://svn.apache.org/viewvc?rev=1161708view=rev Log: * STATUS: Update my vote on the r1146131 group, removing the 1.7.0 clause. Modified: subversion/branches/1.7.x/STATUS Modified: subversion/branches/1.7.x/STATUS

svn commit: r1161710 - /subversion/trunk/subversion/tests/libsvn_fs/fs-test.c

2011-08-25 Thread hwright
Author: hwright Date: Thu Aug 25 19:29:04 2011 New Revision: 1161710 URL: http://svn.apache.org/viewvc?rev=1161710view=rev Log: * subversion/tests/libsvn_fs/fs-test.c (revision_props): Allow a test to fail gracefully. Modified: subversion/trunk/subversion/tests/libsvn_fs/fs-test.c

svn commit: r1161713 - in /subversion/branches/fs-py: ./ notes/ subversion/include/ subversion/libsvn_client/ subversion/libsvn_fs_base/ subversion/libsvn_fs_fs/ subversion/libsvn_wc/ subversion/mod_d

2011-08-25 Thread hwright
Author: hwright Date: Thu Aug 25 19:33:47 2011 New Revision: 1161713 URL: http://svn.apache.org/viewvc?rev=1161713view=rev Log: On the fs-py branch: Bring up-to-date with trunk, in order to pick up an improved fs test. Modified: subversion/branches/fs-py/ (props changed)

svn commit: r1161721 - in /subversion/trunk/subversion: libsvn_client/merge.c tests/cmdline/merge_tests.py

2011-08-25 Thread pburba
Author: pburba Date: Thu Aug 25 20:01:57 2011 New Revision: 1161721 URL: http://svn.apache.org/viewvc?rev=1161721view=rev Log: Fix issue #3976 'record-only merges which add new subtree mergeinfo don't record mergeinfo describing merge'. * subversion/libsvn_client/merge.c

svn commit: r1161725 - /subversion/branches/issue-3975/

2011-08-25 Thread pburba
Author: pburba Date: Thu Aug 25 20:06:38 2011 New Revision: 1161725 URL: http://svn.apache.org/viewvc?rev=1161725view=rev Log: Delete the issue #3975 branch. This work was reintegrated to ^/subversion/trunk in r1160756. Removed: subversion/branches/issue-3975/

svn commit: r1161731 - /subversion/branches/1.7.x-issue3976/

2011-08-25 Thread pburba
Author: pburba Date: Thu Aug 25 20:21:13 2011 New Revision: 1161731 URL: http://svn.apache.org/viewvc?rev=1161731view=rev Log: Create a 1.7.x backport branch for the issue #3976 fix. Added: subversion/branches/1.7.x-issue3976/ (props changed) - copied from r1161730,

svn commit: r1161735 - in /subversion/branches/1.7.x-issue3976: ./ subversion/tests/cmdline/merge_tests.py

2011-08-25 Thread pburba
Author: pburba Date: Thu Aug 25 20:27:09 2011 New Revision: 1161735 URL: http://svn.apache.org/viewvc?rev=1161735view=rev Log: On the 1.7.x-issue-3976 branch: Merge r1161683 from ^/subversion/trunk. Resolve some minor conflicts with test ordering. Modified:

svn commit: r1161738 - in /subversion/branches/1.7.x-issue3976: ./ subversion/libsvn_client/merge.c subversion/tests/cmdline/merge_tests.py

2011-08-25 Thread pburba
Author: pburba Date: Thu Aug 25 20:35:26 2011 New Revision: 1161738 URL: http://svn.apache.org/viewvc?rev=1161738view=rev Log: On the 1.7.x-issue-3976 branch: Merge r1161721 from ^/subversion/trunk. Modified: subversion/branches/1.7.x-issue3976/ (props changed)

svn commit: r1161776 - /subversion/branches/1.7.x/STATUS

2011-08-25 Thread pburba
Author: pburba Date: Thu Aug 25 22:04:25 2011 New Revision: 1161776 URL: http://svn.apache.org/viewvc?rev=1161776view=rev Log: * STATUS: Nominate issue #3976 record-only merges which add new subtree mergeinfo don't record mergeinfo describing merge fixes. Modified:

svn commit: r1161989 - /subversion/branches/1.7.x/STATUS

2011-08-25 Thread danielsh
Author: danielsh Date: Fri Aug 26 04:31:47 2011 New Revision: 1161989 URL: http://svn.apache.org/viewvc?rev=1161989view=rev Log: Vote for r1159400. Modified: subversion/branches/1.7.x/STATUS Modified: subversion/branches/1.7.x/STATUS URL: