You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by pb...@apache.org on 2011/02/02 17:41:54 UTC
svn commit: r1066520 - in /subversion/trunk: subversion/libsvn_client/
subversion/libsvn_delta/ subversion/libsvn_subr/ subversion/libsvn_wc/
subversion/svnserve/ subversion/tests/cmdline/
subversion/tests/libsvn_repos/ tools/buildbot/master/ tools/dev/
Author: pburba
Date: Wed Feb 2 16:41:47 2011
New Revision: 1066520
URL: http://svn.apache.org/viewvc?rev=1066520&view=rev
Log:
Adjust references to pre-ASF-migration revisions by the +840074 offset.
Did *.h, *.c, and *.py files this go-round. Was thinking of doing everything
in five minutes, until I saw CHANGES (which needs a conversion script unless
you enjoy grunt work).
* subversion/libsvn_client/externals.c
* subversion/libsvn_client/log.c
* subversion/libsvn_client/repos_diff.c
* subversion/libsvn_delta/compose_delta.c
* subversion/libsvn_subr/error.c
* subversion/libsvn_subr/io.c
* subversion/libsvn_wc/diff.c
* subversion/svnserve/serve.c
* subversion/tests/cmdline/blame_tests.py
* subversion/tests/cmdline/depth_tests.py
* subversion/tests/cmdline/lock_tests.py
* subversion/tests/cmdline/merge_reintegrate_tests.py
* subversion/tests/cmdline/merge_tests.py
* subversion/tests/cmdline/update_tests.py
* subversion/tests/libsvn_repos/repos-test.c
* tools/buildbot/master/Feeder.py
* tools/dev/check-license.py
Modified:
subversion/trunk/subversion/libsvn_client/externals.c
subversion/trunk/subversion/libsvn_client/log.c
subversion/trunk/subversion/libsvn_client/repos_diff.c
subversion/trunk/subversion/libsvn_delta/compose_delta.c
subversion/trunk/subversion/libsvn_subr/error.c
subversion/trunk/subversion/libsvn_subr/io.c
subversion/trunk/subversion/libsvn_wc/diff.c
subversion/trunk/subversion/svnserve/serve.c
subversion/trunk/subversion/tests/cmdline/blame_tests.py
subversion/trunk/subversion/tests/cmdline/depth_tests.py
subversion/trunk/subversion/tests/cmdline/lock_tests.py
subversion/trunk/subversion/tests/cmdline/merge_reintegrate_tests.py
subversion/trunk/subversion/tests/cmdline/merge_tests.py
subversion/trunk/subversion/tests/cmdline/update_tests.py
subversion/trunk/subversion/tests/libsvn_repos/repos-test.c
subversion/trunk/tools/buildbot/master/Feeder.py
subversion/trunk/tools/dev/check-license.py
Modified: subversion/trunk/subversion/libsvn_client/externals.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/externals.c?rev=1066520&r1=1066519&r2=1066520&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/externals.c (original)
+++ subversion/trunk/subversion/libsvn_client/externals.c Wed Feb 2 16:41:47 2011
@@ -1256,7 +1256,7 @@ svn_client__handle_externals(apr_hash_t
SVN_ERR_ASSERT(svn_dirent_is_absolute(to_abspath));
- /* Sanity check; see r30124. */
+ /* Sanity check; see r870198. */
if (! svn_path_is_url(from_url))
return svn_error_createf
(SVN_ERR_BAD_URL, NULL, _("'%s' is not a URL"), from_url);
Modified: subversion/trunk/subversion/libsvn_client/log.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/log.c?rev=1066520&r1=1066519&r2=1066520&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/log.c (original)
+++ subversion/trunk/subversion/libsvn_client/log.c Wed Feb 2 16:41:47 2011
@@ -527,13 +527,13 @@ svn_client_log5(const apr_array_header_t
* the named range. This led to revisions being printed in strange
* order or being printed more than once. This is issue 1550.
*
- * In r11599, jpieper blocked multiple wc targets in svn/log-cmd.c,
+ * In r851673, jpieper blocked multiple wc targets in svn/log-cmd.c,
* meaning this block not only doesn't work right in that case, but isn't
* even testable that way (svn has no unit test suite; we can only test
* via the svn command). So, that check is now moved into this function
* (see above).
*
- * kfogel ponders future enhancements in r4186:
+ * kfogel ponders future enhancements in r844260:
* I think that's okay behavior, since the sense of the command is
* that one wants a particular range of logs for *this* file, then
* another range for *that* file, and so on. But we should
Modified: subversion/trunk/subversion/libsvn_client/repos_diff.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/repos_diff.c?rev=1066520&r1=1066519&r2=1066520&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/repos_diff.c (original)
+++ subversion/trunk/subversion/libsvn_client/repos_diff.c Wed Feb 2 16:41:47 2011
@@ -419,7 +419,7 @@ get_empty_file(struct edit_baton *eb,
const char **empty_file_path)
{
/* Create the file if it does not exist */
- /* Note that we tried to use /dev/null in r17220, but
+ /* Note that we tried to use /dev/null in r857294, but
that won't work on Windows: it's impossible to stat NUL */
if (!eb->empty_file)
SVN_ERR(svn_io_open_unique_file3(NULL, &(eb->empty_file), NULL,
Modified: subversion/trunk/subversion/libsvn_delta/compose_delta.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_delta/compose_delta.c?rev=1066520&r1=1066519&r2=1066520&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_delta/compose_delta.c (original)
+++ subversion/trunk/subversion/libsvn_delta/compose_delta.c Wed Feb 2 16:41:47 2011
@@ -703,7 +703,7 @@ copy_source_ops(apr_size_t offset, apr_s
/* ### FIXME: ptn_overlap is unsigned, so the if() condition
below is always true! Either it should be '> 0', or the
- code block should be unconditional. See also r2288. */
+ code block should be unconditional. See also r842362. */
if (ptn_overlap >= 0)
{
/* Issue second subrange in the pattern. */
Modified: subversion/trunk/subversion/libsvn_subr/error.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/error.c?rev=1066520&r1=1066519&r2=1066520&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/error.c (original)
+++ subversion/trunk/subversion/libsvn_subr/error.c Wed Feb 2 16:41:47 2011
@@ -505,7 +505,7 @@ svn_handle_error2(svn_error_t *err,
/* ### The rest of this file carefully avoids using svn_pool_*(),
preferring apr_pool_*() instead. I can't remember why -- it may
- be an artifact of r3719, or it may be for some deeper reason --
+ be an artifact of r843793, or it may be for some deeper reason --
but I'm playing it safe and using apr_pool_*() here too. */
apr_pool_create(&subpool, err->pool);
empties = apr_array_make(subpool, 0, sizeof(apr_status_t));
Modified: subversion/trunk/subversion/libsvn_subr/io.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/io.c?rev=1066520&r1=1066519&r2=1066520&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/io.c (original)
+++ subversion/trunk/subversion/libsvn_subr/io.c Wed Feb 2 16:41:47 2011
@@ -3935,7 +3935,7 @@ svn_io_open_unique_file3(apr_file_t **fi
* ### This will cause working files having mode 0600 while users might
* ### expect to see 644 or 664. Ideally, permissions should be tweaked
* ### by our callers after installing tempfiles in the WC, but until
- * ### that's done we need to avoid breaking pre-r40264 behaviour.
+ * ### that's done we need to avoid breaking pre-r880338 behaviour.
* ### So we tweak perms of the tempfile here, but only if the umask
* ### allows it. */
SVN_ERR(merge_default_file_perms(tempfile, &perms, scratch_pool));
Modified: subversion/trunk/subversion/libsvn_wc/diff.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/diff.c?rev=1066520&r1=1066519&r2=1066520&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/diff.c (original)
+++ subversion/trunk/subversion/libsvn_wc/diff.c Wed Feb 2 16:41:47 2011
@@ -486,7 +486,7 @@ get_empty_file(struct edit_baton *b,
const char **empty_file)
{
/* Create the file if it does not exist */
- /* Note that we tried to use /dev/null in r17220, but
+ /* Note that we tried to use /dev/null in r857294, but
that won't work on Windows: it's impossible to stat NUL */
if (!b->empty_file)
{
Modified: subversion/trunk/subversion/svnserve/serve.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svnserve/serve.c?rev=1066520&r1=1066519&r2=1066520&view=diff
==============================================================================
--- subversion/trunk/subversion/svnserve/serve.c (original)
+++ subversion/trunk/subversion/svnserve/serve.c Wed Feb 2 16:41:47 2011
@@ -259,8 +259,8 @@ svn_error_t *load_configs(svn_config_t *
proceed without it anyway.
### Not entirely sure why SVN_ERR_BAD_FILENAME is checked
- ### for here. That seems to have been introduced in r16840,
- ### and only in r30868 was the APR_EACCES check introduced. */
+ ### for here. That seems to have been introduced in r856914,
+ ### and only in r870942 was the APR_EACCES check introduced. */
if (err->apr_err != SVN_ERR_BAD_FILENAME
&& ! APR_STATUS_IS_EACCES(err->apr_err))
{
Modified: subversion/trunk/subversion/tests/cmdline/blame_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/blame_tests.py?rev=1066520&r1=1066519&r2=1066520&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/blame_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/blame_tests.py Wed Feb 2 16:41:47 2011
@@ -243,8 +243,8 @@ def blame_in_xml(sbox):
# For a line changed before the requested start revision, blame should not
-# print a revision number (as fixed in r8035) or crash (as it did with
-# "--verbose" before being fixed in r9890).
+# print a revision number (as fixed in r848109) or crash (as it did with
+# "--verbose" before being fixed in r849964).
#
def blame_on_unknown_revision(sbox):
"blame lines from unknown revisions"
Modified: subversion/trunk/subversion/tests/cmdline/depth_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/depth_tests.py?rev=1066520&r1=1066519&r2=1066520&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/depth_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/depth_tests.py Wed Feb 2 16:41:47 2011
@@ -2319,7 +2319,7 @@ def excluded_receive_remote_removal(sbox
'cp', C_path, B_path)
-# Regression test for r36686.
+# Regression test for r876760.
def exclude_keeps_hidden_entries(sbox):
"'up --set-depth exclude' doesn't lose entries"
Modified: subversion/trunk/subversion/tests/cmdline/lock_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/lock_tests.py?rev=1066520&r1=1066519&r2=1066520&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/lock_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/lock_tests.py Wed Feb 2 16:41:47 2011
@@ -954,7 +954,7 @@ def lock_uri_encoded(sbox):
#----------------------------------------------------------------------
# A regression test for a bug when svn:needs-lock and svn:executable
-# interact badly. The bug was fixed in trunk @ r14859.
+# interact badly. The bug was fixed in trunk @ r854933.
def lock_and_exebit1(sbox):
"svn:needs-lock and svn:executable, part I"
Modified: subversion/trunk/subversion/tests/cmdline/merge_reintegrate_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/merge_reintegrate_tests.py?rev=1066520&r1=1066519&r2=1066520&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/merge_reintegrate_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/merge_reintegrate_tests.py Wed Feb 2 16:41:47 2011
@@ -383,8 +383,8 @@ def reintegrate_with_rename(sbox):
# Update the wcs again.
#
- # Note: this update had to be added because of r28942 (which was
- # merged into the reintegrate branch in r28947). Without this
+ # Note: this update had to be added because of r869016 (which was
+ # merged into the reintegrate branch in r869021). Without this
# update, the mergeinfo will not be inherited properly as part of
# the 'svn cp tau tauprime' step, and later (during the post-commit
# update, with the new expected_disk) we'll get an error like this:
@@ -1253,7 +1253,7 @@ def reintegrate_with_subtree_mergeinfo(s
# of 'trunk' was previously merged to 'branch'
# r16 - A) REPOS-to-REPOS rename of A/D/gamma to A/D/gamma_moved. Since
- # r34184 WC-to-WC moves won't create mergeinfo on the dest if the source
+ # r874258 WC-to-WC moves won't create mergeinfo on the dest if the source
# doesn't have any. So do a repos-to-repos move so explicit mergeinfo
# *is* created on the destination.
svntest.actions.run_and_verify_svn(None, None,[], 'move',
Modified: subversion/trunk/subversion/tests/cmdline/merge_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/merge_tests.py?rev=1066520&r1=1066519&r2=1066520&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/merge_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/merge_tests.py Wed Feb 2 16:41:47 2011
@@ -5232,7 +5232,7 @@ def mergeinfo_inheritance_and_discontinu
# Wipe the memory of a portion of the previous merge...
### It'd be nice to use 'merge --record-only' here, but we can't (yet)
- ### wipe all ranges for a file due to the bug pointed out in r24645.
+ ### wipe all ranges for a file due to the bug pointed out in r864719.
mu_copy_path = os.path.join(A_COPY_path, 'mu')
svntest.actions.run_and_verify_svn(None,
["property '" + SVN_PROP_MERGEINFO
Modified: subversion/trunk/subversion/tests/cmdline/update_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/update_tests.py?rev=1066520&r1=1066519&r2=1066520&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/update_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/update_tests.py Wed Feb 2 16:41:47 2011
@@ -3936,7 +3936,7 @@ def update_accept_conflicts(sbox):
extra_files)
# Test for a wc corruption race condition (possibly introduced in
-# r23342) which is easy to trigger if interactive conflict resolution
+# r863416) which is easy to trigger if interactive conflict resolution
# dies in the middle of prompting. Specifically, we run an update
# with interactive-conflicts on but close stdin immediately, so the
# prompt errors out; then the dir_baton pool cleanup handlers in the
Modified: subversion/trunk/subversion/tests/libsvn_repos/repos-test.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_repos/repos-test.c?rev=1066520&r1=1066519&r2=1066520&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_repos/repos-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_repos/repos-test.c Wed Feb 2 16:41:47 2011
@@ -2106,7 +2106,7 @@ reporter_depth_exclude(const svn_test_op
FALSE, NULL, subpool));
/* This is the illegal call, since A/D was excluded above; the call
- itself will not error, but finish_report() will. As of r28098,
+ itself will not error, but finish_report() will. As of r868172,
this delayed error behavior is not actually promised by the
reporter API, which merely warns callers not to touch a path
underneath a previously excluded path without defining what will
Modified: subversion/trunk/tools/buildbot/master/Feeder.py
URL: http://svn.apache.org/viewvc/subversion/trunk/tools/buildbot/master/Feeder.py?rev=1066520&r1=1066519&r2=1066520&view=diff
==============================================================================
--- subversion/trunk/tools/buildbot/master/Feeder.py (original)
+++ subversion/trunk/tools/buildbot/master/Feeder.py Wed Feb 2 16:41:47 2011
@@ -167,7 +167,7 @@ class FeedResource(XmlResource):
projectName = self.status.getProjectName()
link = re.sub(r'index.html', "", self.status.getURLForThing(build))
- # title: trunk r22191 (plus patch) failed on 'i686-debian-sarge1 shared gcc-3.3.5'
+ # title: trunk r862265 (plus patch) failed on 'i686-debian-sarge1 shared gcc-3.3.5'
ss = build.getSourceStamp()
source = ""
if ss.branch:
Modified: subversion/trunk/tools/dev/check-license.py
URL: http://svn.apache.org/viewvc/subversion/trunk/tools/dev/check-license.py?rev=1066520&r1=1066519&r2=1066520&view=diff
==============================================================================
--- subversion/trunk/tools/dev/check-license.py (original)
+++ subversion/trunk/tools/dev/check-license.py Wed Feb 2 16:41:47 2011
@@ -19,7 +19,7 @@
import sys, os, re
# Note: Right now, OLD_LICENSE and NEW_LICENSE are the same, because
-# r38370 updated all the license blocks. In the future, if we update
+# r878444 updated all the license blocks. In the future, if we update
# the license block again, change just NEW_LICENSE and use this script.
OLD_LICENSE = '''\