/[Apache-SVN]
ViewVC logotype

Revision 1588772


Jump to revision: Previous Next
Author: rhuijben
Date: Sun Apr 20 14:46:42 2014 UTC (10 years, 6 months ago)
Changed paths: 2
Log Message:
Implement an initial fix for issue #4480 "Mergeinfo overwritten on successive
merges".

As noted in the code this patch might make this code report out of date in a
few cases where we should allow a commit, but this is much safer than not
reporting out of date where we should.

As far as I can tell this check matches how we do things in the repos/fs
commit api, so I hope somebody with more knowledge of these apis can
confirm that this is the right fix to close issue #4480.

* subversion/mod_dav_svn/repos.c
  (do_out_of_date_check): Implement an additional out of date check for
    directory changes to catch the issue #4480 problem.

* subversion/tests/cmdline/commit_tests.py
  (commit_mergeinfo_ood): Remove XFail marker.


Changed paths

Path Details
Directorysubversion/trunk/subversion/mod_dav_svn/repos.c modified , text changed
Directorysubversion/trunk/subversion/tests/cmdline/commit_tests.py modified , text changed

infrastructure at apache.org
ViewVC Help
Powered by ViewVC 1.1.26