You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by hw...@apache.org on 2010/08/10 19:03:37 UTC
svn commit: r984122 [17/40] - in /subversion/branches/ignore-mergeinfo: ./
build/ build/ac-macros/ build/generator/ build/generator/swig/
build/generator/templates/ build/generator/util/ build/hudson/
build/hudson/jobs/ build/hudson/jobs/subversion-1.6...
Modified: subversion/branches/ignore-mergeinfo/subversion/libsvn_client/revisions.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/libsvn_client/revisions.c?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/libsvn_client/revisions.c (original)
+++ subversion/branches/ignore-mergeinfo/subversion/libsvn_client/revisions.c Tue Aug 10 17:03:06 2010
@@ -2,10 +2,10 @@
* revisions.c: discovering revisions
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
@@ -86,6 +86,11 @@ svn_client__get_revision_number(svn_revn
return svn_error_create(SVN_ERR_CLIENT_VERSIONED_PATH_REQUIRED,
NULL, NULL);
+ /* The BASE, COMMITTED, and PREV revision keywords do not
+ apply to URLs. */
+ if (svn_path_is_url(local_abspath))
+ goto invalid_rev_arg;
+
SVN_ERR(svn_wc__get_entry_versioned(&ent, wc_ctx, local_abspath,
svn_node_unknown, FALSE, FALSE,
scratch_pool, scratch_pool));
@@ -104,6 +109,11 @@ svn_client__get_revision_number(svn_revn
return svn_error_create(SVN_ERR_CLIENT_VERSIONED_PATH_REQUIRED,
NULL, NULL);
+ /* The BASE, COMMITTED, and PREV revision keywords do not
+ apply to URLs. */
+ if (svn_path_is_url(local_abspath))
+ goto invalid_rev_arg;
+
SVN_ERR(svn_wc__get_entry_versioned(&ent, wc_ctx, local_abspath,
svn_node_unknown, FALSE, FALSE,
scratch_pool, scratch_pool));
@@ -155,4 +165,10 @@ svn_client__get_revision_number(svn_revn
*revnum = *youngest_rev;
return SVN_NO_ERROR;
+
+ invalid_rev_arg:
+ return svn_error_create(
+ SVN_ERR_CLIENT_BAD_REVISION, NULL,
+ _("PREV, BASE, or COMMITTED revision keywords are invalid for URL"));
+
}
Modified: subversion/branches/ignore-mergeinfo/subversion/libsvn_client/status.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/libsvn_client/status.c?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/libsvn_client/status.c (original)
+++ subversion/branches/ignore-mergeinfo/subversion/libsvn_client/status.c Tue Aug 10 17:03:06 2010
@@ -2,10 +2,10 @@
* status.c: return the status of a working copy dirent
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
@@ -308,7 +308,7 @@ svn_client_status5(svn_revnum_t *result_
_("Ignoring properties with a remote status not yet supported."));
if (result_rev)
- *result_rev = SVN_INVALID_REVNUM;;
+ *result_rev = SVN_INVALID_REVNUM;
sb.real_status_func = status_func;
sb.real_status_baton = status_baton;
@@ -427,10 +427,10 @@ svn_client_status5(svn_revnum_t *result_
dir_abspath, target_basename,
depth, get_all,
no_ignore, ignores, tweak_status, &sb,
- ignore_externals ? svn_cl__store_externals
- : NULL,
- ignore_externals ? &externals_store
- : NULL,
+ ignore_externals ? NULL
+ : svn_cl__store_externals,
+ ignore_externals ? NULL
+ : &externals_store,
ctx->cancel_func, ctx->cancel_baton,
pool, pool));
@@ -526,12 +526,12 @@ svn_client_status5(svn_revnum_t *result_
else
{
err = svn_wc_walk_status(ctx->wc_ctx, target_abspath,
- depth, get_all, no_ignore, ignores,
+ depth, get_all, no_ignore, FALSE, ignores,
tweak_status, &sb,
- ignore_externals ? svn_cl__store_externals
- : NULL,
- ignore_externals ? &externals_store
- : NULL,
+ ignore_externals ? NULL
+ : svn_cl__store_externals,
+ ignore_externals ? NULL
+ : &externals_store,
ctx->cancel_func, ctx->cancel_baton,
pool);
Modified: subversion/branches/ignore-mergeinfo/subversion/libsvn_client/switch.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/libsvn_client/switch.c?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/libsvn_client/switch.c (original)
+++ subversion/branches/ignore-mergeinfo/subversion/libsvn_client/switch.c Tue Aug 10 17:03:06 2010
@@ -2,10 +2,10 @@
* switch.c: implement 'switch' feature via WC & RA interfaces.
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
@@ -81,7 +81,7 @@ svn_client__switch_internal(svn_revnum_t
const svn_boolean_t close_adm_access = ! adm_access;
const char *diff3_cmd;
svn_boolean_t use_commit_times;
- svn_boolean_t sleep_here;
+ svn_boolean_t sleep_here = FALSE;
svn_boolean_t *use_sleep = timestamp_sleep ? timestamp_sleep : &sleep_here;
const svn_delta_editor_t *switch_editor;
void *switch_edit_baton;
Modified: subversion/branches/ignore-mergeinfo/subversion/libsvn_client/update.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/libsvn_client/update.c?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/libsvn_client/update.c (original)
+++ subversion/branches/ignore-mergeinfo/subversion/libsvn_client/update.c Tue Aug 10 17:03:06 2010
@@ -2,10 +2,10 @@
* update.c: wrappers around wc update functionality
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
@@ -102,7 +102,6 @@ svn_client__update_internal(svn_revnum_t
const char *repos_root;
svn_error_t *err;
svn_revnum_t revnum;
- int levels_to_lock;
svn_wc_traversal_info_t *traversal_info = svn_wc_init_traversal_info(pool);
svn_wc_adm_access_t *adm_access;
svn_boolean_t use_commit_times;
@@ -125,22 +124,6 @@ svn_client__update_internal(svn_revnum_t
if (depth == svn_depth_unknown)
depth_is_sticky = FALSE;
- /* ### Ah, the irony. We'd like to base our levels_to_lock on the
- ### depth we're going to use for the update. But that may depend
- ### on the depth in the working copy, which we can't discover
- ### without calling adm_open. We could expend an extra call,
- ### with levels_to_lock=0, to get the real depth (but only if we
- ### need to) and then make the real call... but it's not worth
- ### the complexity right now. If the requested depth tells us to
- ### lock the entire tree when we don't actually need to, that's a
- ### performance hit, but (except for access contention) it is not
- ### a correctness problem. */
-
- /* We may have to crop the subtree if the depth is sticky, so lock the
- entire tree in such a situation*/
- levels_to_lock = depth_is_sticky
- ? -1 : SVN_WC__LEVELS_TO_LOCK_FROM_DEPTH(depth);
-
/* Sanity check. Without this, the update is meaningless. */
SVN_ERR_ASSERT(path);
@@ -157,7 +140,8 @@ svn_client__update_internal(svn_revnum_t
*/
SVN_ERR(svn_wc__adm_open_anchor_in_context(&adm_access, &dir_access,
&target, ctx->wc_ctx, path,
- TRUE, levels_to_lock,
+ TRUE,
+ -1, /* recursive lock */
ctx->cancel_func,
ctx->cancel_baton, pool));
}
@@ -166,8 +150,9 @@ svn_client__update_internal(svn_revnum_t
/* Assume the exact root is specified (required for externals to work,
as these would otherwise try to open the parent working copy again) */
SVN_ERR(svn_wc__adm_open_in_context(&adm_access, ctx->wc_ctx, path, TRUE,
- levels_to_lock, ctx->cancel_func,
- ctx->cancel_baton, pool));
+ -1, /* recursive lock */
+ ctx->cancel_func, ctx->cancel_baton,
+ pool));
dir_access = adm_access;
target = "";
}
Modified: subversion/branches/ignore-mergeinfo/subversion/libsvn_client/url.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/libsvn_client/url.c?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/libsvn_client/url.c (original)
+++ subversion/branches/ignore-mergeinfo/subversion/libsvn_client/url.c Tue Aug 10 17:03:06 2010
@@ -2,10 +2,10 @@
* url.c: converting paths to urls
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
@@ -93,9 +93,17 @@ svn_client__derive_location(const char *
it into a URL. */
if (! svn_path_is_url(abspath_or_url))
{
- SVN_ERR(svn_client__entry_location(url, peg_revnum, ctx->wc_ctx,
- abspath_or_url, peg_revision->kind,
- result_pool, scratch_pool));
+ /* If we need to contact the repository for *PEG_REVNUM just get
+ the *URL now. Otherwise the working copy has all the information
+ we need. */
+ if (peg_revision->kind == svn_opt_revision_date
+ || peg_revision->kind == svn_opt_revision_head)
+ SVN_ERR(svn_wc__node_get_url(url, ctx->wc_ctx, abspath_or_url,
+ result_pool, scratch_pool));
+ else
+ SVN_ERR(svn_client__entry_location(url, peg_revnum, ctx->wc_ctx,
+ abspath_or_url, peg_revision->kind,
+ result_pool, scratch_pool));
}
else
{
@@ -131,6 +139,12 @@ svn_client__entry_location(const char **
{
const svn_wc_entry_t *entry;
+ /* This function doesn't contact the repository, so error out if
+ asked to do so. */
+ if (peg_rev_kind == svn_opt_revision_date
+ || peg_rev_kind == svn_opt_revision_head)
+ return svn_error_create(SVN_ERR_CLIENT_BAD_REVISION, NULL, NULL);
+
SVN_ERR(svn_wc__get_entry_versioned(&entry, wc_ctx, local_abspath,
svn_node_unknown, FALSE, FALSE,
scratch_pool, scratch_pool));
@@ -145,7 +159,18 @@ svn_client__entry_location(const char **
{
*url = apr_pstrdup(result_pool, entry->url);
if (revnum)
- *revnum = entry->revision;
+ {
+ if (peg_rev_kind == svn_opt_revision_committed)
+ *revnum = entry->cmt_rev;
+ else if (peg_rev_kind == svn_opt_revision_previous)
+ *revnum = entry->cmt_rev - 1;
+ else
+ /* Local modifications are not relevant here, so consider
+ svn_opt_revision_unspecified, svn_opt_revision_number,
+ svn_opt_revision_base, and svn_opt_revision_working
+ as the same. */
+ *revnum = entry->revision;
+ }
}
else
{
Modified: subversion/branches/ignore-mergeinfo/subversion/libsvn_client/util.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/libsvn_client/util.c?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/libsvn_client/util.c (original)
+++ subversion/branches/ignore-mergeinfo/subversion/libsvn_client/util.c Tue Aug 10 17:03:06 2010
@@ -2,10 +2,10 @@
* util.c : utility functions for the libsvn_client library
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
@@ -180,6 +180,8 @@ svn_client__path_relative_to_root(const
apr_pool_t *result_pool,
apr_pool_t *scratch_pool)
{
+ /* ### TODO: Rework this to use svn_ra_get_path_relative_to_root(). */
+
SVN_ERR_ASSERT(repos_root != NULL || ra_session != NULL);
/* If we have a WC path... */
Modified: subversion/branches/ignore-mergeinfo/subversion/libsvn_client/version.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/libsvn_client/version.c?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/libsvn_client/version.c (original)
+++ subversion/branches/ignore-mergeinfo/subversion/libsvn_client/version.c Tue Aug 10 17:03:06 2010
@@ -2,10 +2,10 @@
* version.c: library version number
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/ignore-mergeinfo/subversion/libsvn_delta/cancel.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/libsvn_delta/cancel.c?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/libsvn_delta/cancel.c (original)
+++ subversion/branches/ignore-mergeinfo/subversion/libsvn_delta/cancel.c Tue Aug 10 17:03:06 2010
@@ -2,10 +2,10 @@
* cancel.c: Routines to support cancellation of running subversion functions.
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/ignore-mergeinfo/subversion/libsvn_delta/compat.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/libsvn_delta/compat.c?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/libsvn_delta/compat.c (original)
+++ subversion/branches/ignore-mergeinfo/subversion/libsvn_delta/compat.c Tue Aug 10 17:03:06 2010
@@ -2,10 +2,10 @@
* compat.c : Wrappers and callbacks for compatibility.
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/ignore-mergeinfo/subversion/libsvn_delta/compose_delta.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/libsvn_delta/compose_delta.c?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/libsvn_delta/compose_delta.c (original)
+++ subversion/branches/ignore-mergeinfo/subversion/libsvn_delta/compose_delta.c Tue Aug 10 17:03:06 2010
@@ -2,10 +2,10 @@
* compose_delta.c: Delta window composition.
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/ignore-mergeinfo/subversion/libsvn_delta/debug_editor.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/libsvn_delta/debug_editor.c?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/libsvn_delta/debug_editor.c (original)
+++ subversion/branches/ignore-mergeinfo/subversion/libsvn_delta/debug_editor.c Tue Aug 10 17:03:06 2010
@@ -2,10 +2,10 @@
* debug_editor.c : An editor that writes the operations it does to stderr.
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/ignore-mergeinfo/subversion/libsvn_delta/debug_editor.h
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/libsvn_delta/debug_editor.h?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/libsvn_delta/debug_editor.h (original)
+++ subversion/branches/ignore-mergeinfo/subversion/libsvn_delta/debug_editor.h Tue Aug 10 17:03:06 2010
@@ -1,9 +1,9 @@
/*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/ignore-mergeinfo/subversion/libsvn_delta/default_editor.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/libsvn_delta/default_editor.c?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/libsvn_delta/default_editor.c (original)
+++ subversion/branches/ignore-mergeinfo/subversion/libsvn_delta/default_editor.c Tue Aug 10 17:03:06 2010
@@ -2,10 +2,10 @@
* default_editor.c -- provide a basic svn_delta_editor_t
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/ignore-mergeinfo/subversion/libsvn_delta/delta.h
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/libsvn_delta/delta.h?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/libsvn_delta/delta.h (original)
+++ subversion/branches/ignore-mergeinfo/subversion/libsvn_delta/delta.h Tue Aug 10 17:03:06 2010
@@ -2,10 +2,10 @@
* delta.h: private delta library things
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/ignore-mergeinfo/subversion/libsvn_delta/depth_filter_editor.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/libsvn_delta/depth_filter_editor.c?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/libsvn_delta/depth_filter_editor.c (original)
+++ subversion/branches/ignore-mergeinfo/subversion/libsvn_delta/depth_filter_editor.c Tue Aug 10 17:03:06 2010
@@ -3,10 +3,10 @@
* another editor and provides depth-based filtering
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/ignore-mergeinfo/subversion/libsvn_delta/editor.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/libsvn_delta/editor.c?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/libsvn_delta/editor.c (original)
+++ subversion/branches/ignore-mergeinfo/subversion/libsvn_delta/editor.c Tue Aug 10 17:03:06 2010
@@ -2,10 +2,10 @@
* editor.c : editing trees of versioned resources
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/ignore-mergeinfo/subversion/libsvn_delta/path_driver.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/libsvn_delta/path_driver.c?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/libsvn_delta/path_driver.c (original)
+++ subversion/branches/ignore-mergeinfo/subversion/libsvn_delta/path_driver.c Tue Aug 10 17:03:06 2010
@@ -2,10 +2,10 @@
* path_driver.c -- drive an editor across a set of paths
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/ignore-mergeinfo/subversion/libsvn_delta/svndiff.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/libsvn_delta/svndiff.c?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/libsvn_delta/svndiff.c (original)
+++ subversion/branches/ignore-mergeinfo/subversion/libsvn_delta/svndiff.c Tue Aug 10 17:03:06 2010
@@ -2,10 +2,10 @@
* svndiff.c -- Encoding and decoding svndiff-format deltas.
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
@@ -190,7 +190,7 @@ window_handler(svn_txdelta_window_t *win
/* Make sure we write the header. */
if (eb->header_done == FALSE)
{
- char svnver[4] = "SVN\0";
+ char svnver[4] = {'S','V','N','\0'};
len = 4;
svnver[3] = eb->version;
SVN_ERR(svn_stream_write(eb->output, svnver, &len));
Modified: subversion/branches/ignore-mergeinfo/subversion/libsvn_delta/text_delta.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/libsvn_delta/text_delta.c?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/libsvn_delta/text_delta.c (original)
+++ subversion/branches/ignore-mergeinfo/subversion/libsvn_delta/text_delta.c Tue Aug 10 17:03:06 2010
@@ -2,10 +2,10 @@
* text-delta.c -- Internal text delta representation
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/ignore-mergeinfo/subversion/libsvn_delta/version.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/libsvn_delta/version.c?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/libsvn_delta/version.c (original)
+++ subversion/branches/ignore-mergeinfo/subversion/libsvn_delta/version.c Tue Aug 10 17:03:06 2010
@@ -2,10 +2,10 @@
* version.c: library version number
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/ignore-mergeinfo/subversion/libsvn_delta/xdelta.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/libsvn_delta/xdelta.c?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/libsvn_delta/xdelta.c (original)
+++ subversion/branches/ignore-mergeinfo/subversion/libsvn_delta/xdelta.c Tue Aug 10 17:03:06 2010
@@ -2,10 +2,10 @@
* xdelta.c: xdelta generator.
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/ignore-mergeinfo/subversion/libsvn_diff/deprecated.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/libsvn_diff/deprecated.c?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/libsvn_diff/deprecated.c (original)
+++ subversion/branches/ignore-mergeinfo/subversion/libsvn_diff/deprecated.c Tue Aug 10 17:03:06 2010
@@ -3,10 +3,10 @@
* "we can't lose 'em, but we can shun 'em!"
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/ignore-mergeinfo/subversion/libsvn_diff/diff.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/libsvn_diff/diff.c?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/libsvn_diff/diff.c (original)
+++ subversion/branches/ignore-mergeinfo/subversion/libsvn_diff/diff.c Tue Aug 10 17:03:06 2010
@@ -2,10 +2,10 @@
* diff.c : routines for doing diffs
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/ignore-mergeinfo/subversion/libsvn_diff/diff.h
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/libsvn_diff/diff.h?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/libsvn_diff/diff.h (original)
+++ subversion/branches/ignore-mergeinfo/subversion/libsvn_diff/diff.h Tue Aug 10 17:03:06 2010
@@ -2,10 +2,10 @@
* diff.h : private header file
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/ignore-mergeinfo/subversion/libsvn_diff/diff3.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/libsvn_diff/diff3.c?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/libsvn_diff/diff3.c (original)
+++ subversion/branches/ignore-mergeinfo/subversion/libsvn_diff/diff3.c Tue Aug 10 17:03:06 2010
@@ -2,10 +2,10 @@
* diff3.c : routines for doing diffs
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/ignore-mergeinfo/subversion/libsvn_diff/diff4.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/libsvn_diff/diff4.c?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/libsvn_diff/diff4.c (original)
+++ subversion/branches/ignore-mergeinfo/subversion/libsvn_diff/diff4.c Tue Aug 10 17:03:06 2010
@@ -2,10 +2,10 @@
* diff.c : routines for doing diffs
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/ignore-mergeinfo/subversion/libsvn_diff/diff_file.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/libsvn_diff/diff_file.c?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/libsvn_diff/diff_file.c (original)
+++ subversion/branches/ignore-mergeinfo/subversion/libsvn_diff/diff_file.c Tue Aug 10 17:03:06 2010
@@ -2,10 +2,10 @@
* diff_file.c : routines for doing diffs on files
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
@@ -363,7 +363,7 @@ datasource_get_next_token(apr_uint32_t *
curp, file_baton->options);
file_token->norm_offset = file_token->offset;
- if (file_token->length == 0)
+ if (file_token->length == 0)
/* move past leading ignored characters */
file_token->norm_offset += (c - curp);
@@ -889,10 +889,9 @@ output_unified_line(svn_diff__file_outpu
const char *out_str;
SVN_ERR(svn_utf_cstring_from_utf8_ex2
(&out_str,
- /* The string below is intentionally not marked for
- translation: it's vital to correct operation of
- the diff(1)/patch(1) program pair. */
- APR_EOL_STR "\\ No newline at end of file" APR_EOL_STR,
+ apr_psprintf(baton->pool,
+ APR_EOL_STR "\\ %s" APR_EOL_STR,
+ _("No newline at end of file")),
baton->header_encoding, baton->pool));
svn_stringbuf_appendcstr(baton->hunk, out_str);
}
Modified: subversion/branches/ignore-mergeinfo/subversion/libsvn_diff/diff_memory.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/libsvn_diff/diff_memory.c?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/libsvn_diff/diff_memory.c (original)
+++ subversion/branches/ignore-mergeinfo/subversion/libsvn_diff/diff_memory.c Tue Aug 10 17:03:06 2010
@@ -2,10 +2,10 @@
* diff_memory.c : routines for doing diffs on in-memory data
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/ignore-mergeinfo/subversion/libsvn_diff/lcs.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/libsvn_diff/lcs.c?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/libsvn_diff/lcs.c (original)
+++ subversion/branches/ignore-mergeinfo/subversion/libsvn_diff/lcs.c Tue Aug 10 17:03:06 2010
@@ -2,10 +2,10 @@
* lcs.c : routines for creating an lcs
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/ignore-mergeinfo/subversion/libsvn_diff/parse-diff.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/libsvn_diff/parse-diff.c?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/libsvn_diff/parse-diff.c (original)
+++ subversion/branches/ignore-mergeinfo/subversion/libsvn_diff/parse-diff.c Tue Aug 10 17:03:06 2010
@@ -2,10 +2,10 @@
* parse-diff.c: functions for parsing diff files
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
@@ -22,6 +22,7 @@
*/
#include <limits.h> /* for ULONG_MAX */
+#include <stdlib.h>
#include <string.h>
#include "svn_types.h"
@@ -45,7 +46,7 @@ static svn_boolean_t
parse_offset(svn_linenum_t *offset, const char *number)
{
apr_int64_t parsed_offset;
-
+
errno = 0; /* clear errno for safety */
parsed_offset = apr_atoi64(number);
if (errno == ERANGE || parsed_offset < 0)
@@ -109,7 +110,7 @@ parse_hunk_header(const char *header, sv
static const char * const atat = "@@";
const char *p;
svn_stringbuf_t *range;
-
+
p = header + strlen(atat);
if (*p != ' ')
/* No. */
@@ -167,21 +168,23 @@ parse_hunk_header(const char *header, sv
return TRUE;
}
-/* A stream line-filter which allows only original text from a hunk. */
+/* A stream line-filter which allows only original text from a hunk,
+ * and filters special lines (which start with a backslash). */
static svn_error_t *
original_line_filter(svn_boolean_t *filtered, const char *line, void *baton,
apr_pool_t *scratch_pool)
{
- *filtered = line[0] == '+';
+ *filtered = (line[0] == '+' || line[0] == '\\');
return SVN_NO_ERROR;
}
-/* A stream line-filter which allows only modified text from a hunk. */
+/* A stream line-filter which allows only modified text from a hunk,
+ * and filters special lines (which start with a backslash). */
static svn_error_t *
modified_line_filter(svn_boolean_t *filtered, const char *line, void *baton,
apr_pool_t *scratch_pool)
{
- *filtered = line[0] == '-';
+ *filtered = (line[0] == '-' || line[0] == '\\');
return SVN_NO_ERROR;
}
@@ -217,6 +220,7 @@ parse_next_hunk(svn_hunk_t **hunk,
svn_boolean_t eof, in_hunk, hunk_seen;
apr_off_t pos, last_line;
apr_off_t start, end;
+ svn_stream_t *diff_text;
svn_stream_t *original_text;
svn_stream_t *modified_text;
svn_linenum_t original_lines;
@@ -235,7 +239,7 @@ parse_next_hunk(svn_hunk_t **hunk,
/* Get current seek position -- APR has no ftell() :( */
pos = 0;
- apr_file_seek(patch->patch_file, APR_CUR, &pos);
+ SVN_ERR(svn_io_file_seek(patch->patch_file, APR_CUR, &pos, scratch_pool));
iterpool = svn_pool_create(scratch_pool);
do
@@ -246,16 +250,22 @@ parse_next_hunk(svn_hunk_t **hunk,
/* Remember the current line's offset, and read the line. */
last_line = pos;
- SVN_ERR(svn_stream_readline(stream, &line, patch->eol_str, &eof,
- iterpool));
+ SVN_ERR(svn_stream_readline_detect_eol(stream, &line, NULL, &eof,
+ iterpool));
+
if (! eof)
{
/* Update line offset for next iteration.
* APR has no ftell() :( */
pos = 0;
- apr_file_seek(patch->patch_file, APR_CUR, &pos);
+ SVN_ERR(svn_io_file_seek(patch->patch_file, APR_CUR, &pos, iterpool));
}
+ /* Lines starting with a backslash are comments, such as
+ * "\ No newline at end of file". */
+ if (line->data[0] == '\\')
+ continue;
+
if (in_hunk)
{
char c;
@@ -266,7 +276,7 @@ parse_next_hunk(svn_hunk_t **hunk,
* of the line just read is the hunk text's byte offset. */
start = last_line;
}
-
+
c = line->data[0];
if (original_lines > 0 && (c == ' ' || c == '-'))
{
@@ -295,7 +305,7 @@ parse_next_hunk(svn_hunk_t **hunk,
}
}
else
- {
+ {
if (starts_with(line->data, atat))
{
/* Looks like we have a hunk header, let's try to rip it apart. */
@@ -315,13 +325,21 @@ parse_next_hunk(svn_hunk_t **hunk,
/* Rewind to the start of the line just read, so subsequent calls
* to this function or svn_diff__parse_next_patch() don't end
* up skipping the line -- it may contain a patch or hunk header. */
- apr_file_seek(patch->patch_file, APR_SET, &last_line);
+ SVN_ERR(svn_io_file_seek(patch->patch_file, APR_SET, &last_line,
+ scratch_pool));
if (hunk_seen && start < end)
{
apr_file_t *f;
apr_int32_t flags = APR_READ | APR_BUFFERED;
+ /* Create a stream which returns the hunk text itself. */
+ SVN_ERR(svn_io_file_open(&f, patch->path, flags, APR_OS_DEFAULT,
+ result_pool));
+ diff_text = svn_stream_from_aprfile_range_readonly(f, FALSE,
+ start, end,
+ result_pool);
+
/* Create a stream which returns the original hunk text. */
SVN_ERR(svn_io_file_open(&f, patch->path, flags, APR_OS_DEFAULT,
result_pool));
@@ -329,7 +347,7 @@ parse_next_hunk(svn_hunk_t **hunk,
start, end,
result_pool);
svn_stream_set_line_filter_callback(original_text, original_line_filter);
- svn_stream_set_line_transformer_callback(original_text,
+ svn_stream_set_line_transformer_callback(original_text,
remove_leading_char_transformer);
/* Create a stream which returns the modified hunk text. */
@@ -339,9 +357,10 @@ parse_next_hunk(svn_hunk_t **hunk,
start, end,
result_pool);
svn_stream_set_line_filter_callback(modified_text, modified_line_filter);
- svn_stream_set_line_transformer_callback(modified_text,
+ svn_stream_set_line_transformer_callback(modified_text,
remove_leading_char_transformer);
/* Set the hunk's texts. */
+ (*hunk)->diff_text = diff_text;
(*hunk)->original_text = original_text;
(*hunk)->modified_text = modified_text;
}
@@ -352,7 +371,22 @@ parse_next_hunk(svn_hunk_t **hunk,
return SVN_NO_ERROR;
}
-/*
+/* Compare function for sorting hunks after parsing.
+ * We sort hunks by their original line offset. */
+static int
+compare_hunks(const void *a, const void *b)
+{
+ const svn_hunk_t *ha = *((const svn_hunk_t **)a);
+ const svn_hunk_t *hb = *((const svn_hunk_t **)b);
+
+ if (ha->original_start < hb->original_start)
+ return -1;
+ if (ha->original_start > hb->original_start)
+ return 1;
+ return 0;
+}
+
+/*
* Ensure that all streams which were opened for HUNK are closed.
*/
static svn_error_t *
@@ -360,13 +394,13 @@ close_hunk(svn_hunk_t *hunk)
{
SVN_ERR(svn_stream_close(hunk->original_text));
SVN_ERR(svn_stream_close(hunk->modified_text));
+ SVN_ERR(svn_stream_close(hunk->diff_text));
return SVN_NO_ERROR;
}
svn_error_t *
svn_diff__parse_next_patch(svn_patch_t **patch,
apr_file_t *patch_file,
- const char *eol_str,
apr_pool_t *result_pool,
apr_pool_t *scratch_pool)
{
@@ -375,7 +409,6 @@ svn_diff__parse_next_patch(svn_patch_t *
const char *indicator;
const char *fname;
svn_stream_t *stream;
- apr_off_t pos;
svn_boolean_t eof, in_header;
svn_hunk_t *hunk;
apr_pool_t *iterpool;
@@ -390,14 +423,9 @@ svn_diff__parse_next_patch(svn_patch_t *
/* Get the patch's filename. */
SVN_ERR(svn_io_file_name_get(&fname, patch_file, result_pool));
- /* Get current seek position -- APR has no ftell() :( */
- pos = 0;
- apr_file_seek(patch_file, APR_CUR, &pos);
-
/* Record what we already know about the patch. */
*patch = apr_pcalloc(result_pool, sizeof(**patch));
(*patch)->patch_file = patch_file;
- (*patch)->eol_str = eol_str;
(*patch)->path = fname;
/* Get a stream to read lines from the patch file.
@@ -415,7 +443,8 @@ svn_diff__parse_next_patch(svn_patch_t *
svn_pool_clear(iterpool);
/* Read a line from the stream. */
- SVN_ERR(svn_stream_readline(stream, &line, eol_str, &eof, iterpool));
+ SVN_ERR(svn_stream_readline_detect_eol(stream, &line, NULL, &eof,
+ iterpool));
/* See if we have a diff header. */
if (line->len > strlen(indicator) && starts_with(line->data, indicator))
@@ -483,6 +512,16 @@ svn_diff__parse_next_patch(svn_patch_t *
svn_pool_destroy(iterpool);
SVN_ERR(svn_stream_close(stream));
+ if (*patch)
+ {
+ /* Usually, hunks appear in the patch sorted by their original line
+ * offset. But just in case they weren't parsed in this order for
+ * some reason, we sort them so that our caller can assume that hunks
+ * are sorted as if parsed from a usual patch. */
+ qsort((*patch)->hunks->elts, (*patch)->hunks->nelts,
+ (*patch)->hunks->elt_size, compare_hunks);
+ }
+
return SVN_NO_ERROR;
}
Modified: subversion/branches/ignore-mergeinfo/subversion/libsvn_diff/token.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/libsvn_diff/token.c?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/libsvn_diff/token.c (original)
+++ subversion/branches/ignore-mergeinfo/subversion/libsvn_diff/token.c Tue Aug 10 17:03:06 2010
@@ -2,10 +2,10 @@
* token.c : routines for doing diffs
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/ignore-mergeinfo/subversion/libsvn_diff/util.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/libsvn_diff/util.c?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/libsvn_diff/util.c (original)
+++ subversion/branches/ignore-mergeinfo/subversion/libsvn_diff/util.c Tue Aug 10 17:03:06 2010
@@ -2,10 +2,10 @@
* util.c : routines for doing diffs
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/ignore-mergeinfo/subversion/libsvn_fs/access.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/libsvn_fs/access.c?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/libsvn_fs/access.c (original)
+++ subversion/branches/ignore-mergeinfo/subversion/libsvn_fs/access.c Tue Aug 10 17:03:06 2010
@@ -2,10 +2,10 @@
* access.c: shared code to manipulate svn_fs_access_t objects
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/ignore-mergeinfo/subversion/libsvn_fs/fs-loader.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/libsvn_fs/fs-loader.c?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/libsvn_fs/fs-loader.c (original)
+++ subversion/branches/ignore-mergeinfo/subversion/libsvn_fs/fs-loader.c Tue Aug 10 17:03:06 2010
@@ -2,10 +2,10 @@
* fs_loader.c: Front-end to the various FS back ends
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/ignore-mergeinfo/subversion/libsvn_fs/fs-loader.h
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/libsvn_fs/fs-loader.h?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/libsvn_fs/fs-loader.h (original)
+++ subversion/branches/ignore-mergeinfo/subversion/libsvn_fs/fs-loader.h Tue Aug 10 17:03:06 2010
@@ -2,10 +2,10 @@
* fs_loader.h: Declarations for the FS loader library
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
@@ -168,7 +168,8 @@ typedef struct fs_vtable_t
svn_revnum_t rev, apr_uint32_t flags,
apr_pool_t *pool);
svn_error_t *(*begin_obliteration_txn)(svn_fs_txn_t **txn_p, svn_fs_t *fs,
- svn_revnum_t rev, apr_pool_t *pool);
+ svn_revnum_t replacing_rev,
+ apr_pool_t *pool);
svn_error_t *(*open_txn)(svn_fs_txn_t **txn, svn_fs_t *fs,
const char *name, apr_pool_t *pool);
svn_error_t *(*purge_txn)(svn_fs_t *fs, const char *txn_id,
@@ -202,8 +203,8 @@ typedef struct txn_vtable_t
{
svn_error_t *(*commit)(const char **conflict_p, svn_revnum_t *new_rev,
svn_fs_txn_t *txn, apr_pool_t *pool);
- svn_error_t *(*commit_obliteration)(svn_revnum_t rev, svn_fs_txn_t *txn,
- apr_pool_t *pool);
+ svn_error_t *(*commit_obliteration)(svn_revnum_t replacing_rev,
+ svn_fs_txn_t *txn, apr_pool_t *pool);
svn_error_t *(*abort)(svn_fs_txn_t *txn, apr_pool_t *pool);
svn_error_t *(*get_prop)(svn_string_t **value_p, svn_fs_txn_t *txn,
const char *propname, apr_pool_t *pool);
Modified: subversion/branches/ignore-mergeinfo/subversion/libsvn_fs_base/bdb/bdb-err.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/libsvn_fs_base/bdb/bdb-err.c?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/libsvn_fs_base/bdb/bdb-err.c (original)
+++ subversion/branches/ignore-mergeinfo/subversion/libsvn_fs_base/bdb/bdb-err.c Tue Aug 10 17:03:06 2010
@@ -2,10 +2,10 @@
* err.c : implementation of fs-private error functions
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/ignore-mergeinfo/subversion/libsvn_fs_base/bdb/bdb-err.h
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/libsvn_fs_base/bdb/bdb-err.h?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/libsvn_fs_base/bdb/bdb-err.h (original)
+++ subversion/branches/ignore-mergeinfo/subversion/libsvn_fs_base/bdb/bdb-err.h Tue Aug 10 17:03:06 2010
@@ -2,10 +2,10 @@
* err.h : interface to routines for returning Berkeley DB errors
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/ignore-mergeinfo/subversion/libsvn_fs_base/bdb/bdb_compat.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/libsvn_fs_base/bdb/bdb_compat.c?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/libsvn_fs_base/bdb/bdb_compat.c (original)
+++ subversion/branches/ignore-mergeinfo/subversion/libsvn_fs_base/bdb/bdb_compat.c Tue Aug 10 17:03:06 2010
@@ -1,10 +1,10 @@
/* bdb_compat.c --- Compatibility wrapper for different BDB versions.
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/ignore-mergeinfo/subversion/libsvn_fs_base/bdb/bdb_compat.h
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/libsvn_fs_base/bdb/bdb_compat.h?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/libsvn_fs_base/bdb/bdb_compat.h (original)
+++ subversion/branches/ignore-mergeinfo/subversion/libsvn_fs_base/bdb/bdb_compat.h Tue Aug 10 17:03:06 2010
@@ -1,10 +1,10 @@
/* svn_bdb_compat.h --- Compatibility wrapper for different BDB versions.
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/ignore-mergeinfo/subversion/libsvn_fs_base/bdb/changes-table.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/libsvn_fs_base/bdb/changes-table.c?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/libsvn_fs_base/bdb/changes-table.c (original)
+++ subversion/branches/ignore-mergeinfo/subversion/libsvn_fs_base/bdb/changes-table.c Tue Aug 10 17:03:06 2010
@@ -1,10 +1,10 @@
/* changes-table.c : operations on the `changes' table
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/ignore-mergeinfo/subversion/libsvn_fs_base/bdb/changes-table.h
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/libsvn_fs_base/bdb/changes-table.h?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/libsvn_fs_base/bdb/changes-table.h (original)
+++ subversion/branches/ignore-mergeinfo/subversion/libsvn_fs_base/bdb/changes-table.h Tue Aug 10 17:03:06 2010
@@ -1,10 +1,10 @@
/* changes-table.h : internal interface to `changes' table
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/ignore-mergeinfo/subversion/libsvn_fs_base/bdb/checksum-reps-table.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/libsvn_fs_base/bdb/checksum-reps-table.c?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/libsvn_fs_base/bdb/checksum-reps-table.c (original)
+++ subversion/branches/ignore-mergeinfo/subversion/libsvn_fs_base/bdb/checksum-reps-table.c Tue Aug 10 17:03:06 2010
@@ -1,10 +1,10 @@
/* checksum-reps-table.c : operations on the `checksum-reps' table
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
@@ -204,5 +204,5 @@ svn_error_t *svn_fs_bdb__reserve_rep_reu
svn_fs_base__str_to_dbt(&result, next_key),
0);
- return BDB_WRAP(fs, _("bumping next copy key"), db_err);
+ return BDB_WRAP(fs, _("bumping next representation reuse ID"), db_err);
}
Modified: subversion/branches/ignore-mergeinfo/subversion/libsvn_fs_base/bdb/checksum-reps-table.h
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/libsvn_fs_base/bdb/checksum-reps-table.h?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/libsvn_fs_base/bdb/checksum-reps-table.h (original)
+++ subversion/branches/ignore-mergeinfo/subversion/libsvn_fs_base/bdb/checksum-reps-table.h Tue Aug 10 17:03:06 2010
@@ -1,10 +1,10 @@
/* checksum-reps-table.h : internal interface to ops on `checksum-reps' table
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/ignore-mergeinfo/subversion/libsvn_fs_base/bdb/copies-table.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/libsvn_fs_base/bdb/copies-table.c?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/libsvn_fs_base/bdb/copies-table.c (original)
+++ subversion/branches/ignore-mergeinfo/subversion/libsvn_fs_base/bdb/copies-table.c Tue Aug 10 17:03:06 2010
@@ -1,10 +1,10 @@
/* copies-table.c : operations on the `copies' table
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/ignore-mergeinfo/subversion/libsvn_fs_base/bdb/copies-table.h
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/libsvn_fs_base/bdb/copies-table.h?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/libsvn_fs_base/bdb/copies-table.h (original)
+++ subversion/branches/ignore-mergeinfo/subversion/libsvn_fs_base/bdb/copies-table.h Tue Aug 10 17:03:06 2010
@@ -1,10 +1,10 @@
/* copies-table.h : internal interface to ops on `copies' table
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/ignore-mergeinfo/subversion/libsvn_fs_base/bdb/dbt.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/libsvn_fs_base/bdb/dbt.c?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/libsvn_fs_base/bdb/dbt.c (original)
+++ subversion/branches/ignore-mergeinfo/subversion/libsvn_fs_base/bdb/dbt.c Tue Aug 10 17:03:06 2010
@@ -1,10 +1,10 @@
/* dbt.c --- DBT-frobbing functions
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/ignore-mergeinfo/subversion/libsvn_fs_base/bdb/dbt.h
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/libsvn_fs_base/bdb/dbt.h?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/libsvn_fs_base/bdb/dbt.h (original)
+++ subversion/branches/ignore-mergeinfo/subversion/libsvn_fs_base/bdb/dbt.h Tue Aug 10 17:03:06 2010
@@ -1,10 +1,10 @@
/* dbt.h --- interface to DBT-frobbing functions
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/ignore-mergeinfo/subversion/libsvn_fs_base/bdb/env.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/libsvn_fs_base/bdb/env.c?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/libsvn_fs_base/bdb/env.c (original)
+++ subversion/branches/ignore-mergeinfo/subversion/libsvn_fs_base/bdb/env.c Tue Aug 10 17:03:06 2010
@@ -1,10 +1,10 @@
/* env.h : managing the BDB environment
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/ignore-mergeinfo/subversion/libsvn_fs_base/bdb/env.h
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/libsvn_fs_base/bdb/env.h?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/libsvn_fs_base/bdb/env.h (original)
+++ subversion/branches/ignore-mergeinfo/subversion/libsvn_fs_base/bdb/env.h Tue Aug 10 17:03:06 2010
@@ -1,10 +1,10 @@
/* env.h : managing the BDB environment
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/ignore-mergeinfo/subversion/libsvn_fs_base/bdb/lock-tokens-table.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/libsvn_fs_base/bdb/lock-tokens-table.c?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/libsvn_fs_base/bdb/lock-tokens-table.c (original)
+++ subversion/branches/ignore-mergeinfo/subversion/libsvn_fs_base/bdb/lock-tokens-table.c Tue Aug 10 17:03:06 2010
@@ -1,10 +1,10 @@
/* lock-tokens-table.c : operations on the `lock-tokens' table
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/ignore-mergeinfo/subversion/libsvn_fs_base/bdb/lock-tokens-table.h
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/libsvn_fs_base/bdb/lock-tokens-table.h?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/libsvn_fs_base/bdb/lock-tokens-table.h (original)
+++ subversion/branches/ignore-mergeinfo/subversion/libsvn_fs_base/bdb/lock-tokens-table.h Tue Aug 10 17:03:06 2010
@@ -1,10 +1,10 @@
/* lock-tokens-table.h : internal interface to ops on `lock-tokens' table
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/ignore-mergeinfo/subversion/libsvn_fs_base/bdb/locks-table.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/libsvn_fs_base/bdb/locks-table.c?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/libsvn_fs_base/bdb/locks-table.c (original)
+++ subversion/branches/ignore-mergeinfo/subversion/libsvn_fs_base/bdb/locks-table.c Tue Aug 10 17:03:06 2010
@@ -1,10 +1,10 @@
/* locks-table.c : operations on the `locks' table
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/ignore-mergeinfo/subversion/libsvn_fs_base/bdb/locks-table.h
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/libsvn_fs_base/bdb/locks-table.h?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/libsvn_fs_base/bdb/locks-table.h (original)
+++ subversion/branches/ignore-mergeinfo/subversion/libsvn_fs_base/bdb/locks-table.h Tue Aug 10 17:03:06 2010
@@ -1,10 +1,10 @@
/* locks-table.h : internal interface to ops on `locks' table
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/ignore-mergeinfo/subversion/libsvn_fs_base/bdb/miscellaneous-table.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/libsvn_fs_base/bdb/miscellaneous-table.c?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/libsvn_fs_base/bdb/miscellaneous-table.c (original)
+++ subversion/branches/ignore-mergeinfo/subversion/libsvn_fs_base/bdb/miscellaneous-table.c Tue Aug 10 17:03:06 2010
@@ -1,10 +1,10 @@
/* miscellaneous-table.c : operations on the `miscellaneous' table
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at