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:
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:
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:
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:
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
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:
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.
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
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
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
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)
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
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/
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,
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:
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)
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:
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:
18 matches
Mail list logo