You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by cm...@apache.org on 2009/12/15 07:15:17 UTC
svn commit: r890658 [22/27] - in /subversion/branches/issue-3242-dev: ./
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.x...
Modified: subversion/branches/issue-3242-dev/subversion/svn/schema/list.rnc
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/svn/schema/list.rnc?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/svn/schema/list.rnc (original)
+++ subversion/branches/issue-3242-dev/subversion/svn/schema/list.rnc Tue Dec 15 06:14:36 2009
@@ -1,3 +1,21 @@
+# 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 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
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#
# XML RELAX NG schema for Subversion command-line client output
# For "svn list"
Modified: subversion/branches/issue-3242-dev/subversion/svn/schema/log.rnc
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/svn/schema/log.rnc?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/svn/schema/log.rnc (original)
+++ subversion/branches/issue-3242-dev/subversion/svn/schema/log.rnc Tue Dec 15 06:14:36 2009
@@ -1,3 +1,21 @@
+# 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 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
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#
# XML RELAX NG schema for Subversion command-line client output
# For "svn log"
Modified: subversion/branches/issue-3242-dev/subversion/svn/schema/props.rnc
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/svn/schema/props.rnc?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/svn/schema/props.rnc (original)
+++ subversion/branches/issue-3242-dev/subversion/svn/schema/props.rnc Tue Dec 15 06:14:36 2009
@@ -1,3 +1,21 @@
+# 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 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
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#
# XML RELAX NG schema for Subversion command-line client output
# For "svn proplist"
Modified: subversion/branches/issue-3242-dev/subversion/svn/schema/status.rnc
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/svn/schema/status.rnc?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/svn/schema/status.rnc (original)
+++ subversion/branches/issue-3242-dev/subversion/svn/schema/status.rnc Tue Dec 15 06:14:36 2009
@@ -1,3 +1,21 @@
+# 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 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
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#
# XML RELAX NG schema for Subversion command-line client output
# For "svn status"
Modified: subversion/branches/issue-3242-dev/subversion/svn/status-cmd.c
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/svn/status-cmd.c?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/svn/status-cmd.c (original)
+++ subversion/branches/issue-3242-dev/subversion/svn/status-cmd.c Tue Dec 15 06:14:36 2009
@@ -2,10 +2,10 @@
* status-cmd.c -- Display status information in current directory
*
* ====================================================================
- * 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/issue-3242-dev/subversion/svn/status.c
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/svn/status.c?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/svn/status.c (original)
+++ subversion/branches/issue-3242-dev/subversion/svn/status.c Tue Dec 15 06:14:36 2009
@@ -2,10 +2,10 @@
* status.c: the command-line's portion of the "svn status" command
*
* ====================================================================
- * 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/issue-3242-dev/subversion/svn/svn.1
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/svn/svn.1?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/svn/svn.1 (original)
+++ subversion/branches/issue-3242-dev/subversion/svn/svn.1 Tue Dec 15 06:14:36 2009
@@ -1,3 +1,23 @@
+.\"
+.\"
+.\" 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 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
+.\"
+.\" http://www.apache.org/licenses/LICENSE-2.0
+.\"
+.\" Unless required by applicable law or agreed to in writing,
+.\" software distributed under the License is distributed on an
+.\" "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+.\" KIND, either express or implied. See the License for the
+.\" specific language governing permissions and limitations
+.\" under the License.
+.\"
+.\"
.\" You can view this file with:
.\" nroff -man [filename]
.\"
Modified: subversion/branches/issue-3242-dev/subversion/svn/switch-cmd.c
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/svn/switch-cmd.c?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/svn/switch-cmd.c (original)
+++ subversion/branches/issue-3242-dev/subversion/svn/switch-cmd.c Tue Dec 15 06:14:36 2009
@@ -2,10 +2,10 @@
* switch-cmd.c -- Bring work tree in sync with a different URL
*
* ====================================================================
- * 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/issue-3242-dev/subversion/svn/tree-conflicts.c
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/svn/tree-conflicts.c?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/svn/tree-conflicts.c (original)
+++ subversion/branches/issue-3242-dev/subversion/svn/tree-conflicts.c Tue Dec 15 06:14:36 2009
@@ -2,10 +2,10 @@
* tree-conflicts.c: Tree conflicts.
*
* ====================================================================
- * 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/issue-3242-dev/subversion/svn/tree-conflicts.h
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/svn/tree-conflicts.h?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/svn/tree-conflicts.h (original)
+++ subversion/branches/issue-3242-dev/subversion/svn/tree-conflicts.h Tue Dec 15 06:14:36 2009
@@ -2,10 +2,10 @@
* tree-conflicts.h: Tree conflicts.
*
* ====================================================================
- * 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/issue-3242-dev/subversion/svn/unlock-cmd.c
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/svn/unlock-cmd.c?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/svn/unlock-cmd.c (original)
+++ subversion/branches/issue-3242-dev/subversion/svn/unlock-cmd.c Tue Dec 15 06:14:36 2009
@@ -2,10 +2,10 @@
* unlock-cmd.c -- Unlock a working copy path.
*
* ====================================================================
- * 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/issue-3242-dev/subversion/svn/update-cmd.c
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/svn/update-cmd.c?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/svn/update-cmd.c (original)
+++ subversion/branches/issue-3242-dev/subversion/svn/update-cmd.c Tue Dec 15 06:14:36 2009
@@ -2,10 +2,10 @@
* update-cmd.c -- Bring work tree in sync with repository
*
* ====================================================================
- * 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/issue-3242-dev/subversion/svn/upgrade-cmd.c
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/svn/upgrade-cmd.c?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/svn/upgrade-cmd.c (original)
+++ subversion/branches/issue-3242-dev/subversion/svn/upgrade-cmd.c Tue Dec 15 06:14:36 2009
@@ -2,10 +2,10 @@
* upgrade-cmd.c -- Upgrade a working copy.
*
* ====================================================================
- * 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/issue-3242-dev/subversion/svn/util.c
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/svn/util.c?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/svn/util.c (original)
+++ subversion/branches/issue-3242-dev/subversion/svn/util.c Tue Dec 15 06:14:36 2009
@@ -4,10 +4,10 @@
* in here.
*
* ====================================================================
- * 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/issue-3242-dev/subversion/svn_private_config.hw
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/svn_private_config.hw?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/svn_private_config.hw (original)
+++ subversion/branches/issue-3242-dev/subversion/svn_private_config.hw Tue Dec 15 06:14:36 2009
@@ -2,10 +2,10 @@
* svn_private_config.hw : Template for svn_private_config.h on Win32.
*
* ====================================================================
- * 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/issue-3242-dev/subversion/svnadmin/main.c
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/svnadmin/main.c?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/svnadmin/main.c (original)
+++ subversion/branches/issue-3242-dev/subversion/svnadmin/main.c Tue Dec 15 06:14:36 2009
@@ -2,10 +2,10 @@
* main.c: Subversion server administration tool.
*
* ====================================================================
- * 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
@@ -903,9 +903,9 @@
for (i = 0; i < logfiles->nelts; i++)
{
const char *log_utf8;
- log_utf8 = svn_path_join(opt_state->repository_path,
- APR_ARRAY_IDX(logfiles, i, const char *),
- pool);
+ log_utf8 = svn_dirent_join(opt_state->repository_path,
+ APR_ARRAY_IDX(logfiles, i, const char *),
+ pool);
log_utf8 = svn_dirent_local_style(log_utf8, pool);
SVN_ERR(svn_cmdline_printf(pool, "%s\n", log_utf8));
}
@@ -1611,7 +1611,7 @@
break;
case svnadmin__config_dir:
opt_state.config_dir =
- apr_pstrdup(pool, svn_path_canonicalize(opt_arg, pool));
+ apr_pstrdup(pool, svn_dirent_canonicalize(opt_arg, pool));
break;
case svnadmin__wait:
opt_state.wait = TRUE;
Modified: subversion/branches/issue-3242-dev/subversion/svnadmin/svnadmin.1
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/svnadmin/svnadmin.1?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/svnadmin/svnadmin.1 (original)
+++ subversion/branches/issue-3242-dev/subversion/svnadmin/svnadmin.1 Tue Dec 15 06:14:36 2009
@@ -1,3 +1,23 @@
+.\"
+.\"
+.\" 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 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
+.\"
+.\" http://www.apache.org/licenses/LICENSE-2.0
+.\"
+.\" Unless required by applicable law or agreed to in writing,
+.\" software distributed under the License is distributed on an
+.\" "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+.\" KIND, either express or implied. See the License for the
+.\" specific language governing permissions and limitations
+.\" under the License.
+.\"
+.\"
.\" You can view this file with:
.\" nroff -man [filename]
.\"
Modified: subversion/branches/issue-3242-dev/subversion/svndumpfilter/main.c
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/svndumpfilter/main.c?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/svndumpfilter/main.c (original)
+++ subversion/branches/issue-3242-dev/subversion/svndumpfilter/main.c Tue Dec 15 06:14:36 2009
@@ -2,10 +2,10 @@
* main.c: Subversion dump stream filtering tool.
*
* ====================================================================
- * 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
@@ -89,7 +89,7 @@
namelen = strlen(name);
svn_stringbuf_appendbytes(*strbuf, "K ", 2);
- bytes_used = sprintf(buf, "%d", namelen);
+ bytes_used = apr_snprintf(buf, sizeof(buf), "%d", namelen);
svn_stringbuf_appendbytes(*strbuf, buf, bytes_used);
svn_stringbuf_appendbytes(*strbuf, "\n", 1);
@@ -99,7 +99,7 @@
/* Output value length, then value. */
svn_stringbuf_appendbytes(*strbuf, "V ", 2);
- bytes_used = sprintf(buf, "%" APR_SIZE_T_FMT, value->len);
+ bytes_used = apr_snprintf(buf, sizeof(buf), "%" APR_SIZE_T_FMT, value->len);
svn_stringbuf_appendbytes(*strbuf, buf, bytes_used);
svn_stringbuf_appendbytes(*strbuf, "\n", 1);
@@ -359,13 +359,14 @@
svn_stringbuf_appendcstr(props, "PROPS-END\n");
svn_stringbuf_appendcstr(rb->header,
SVN_REPOS_DUMPFILE_PROP_CONTENT_LENGTH);
- bytes_used = sprintf(buf, ": %" APR_SIZE_T_FMT, props->len);
+ bytes_used = apr_snprintf(buf, sizeof(buf), ": %" APR_SIZE_T_FMT,
+ props->len);
svn_stringbuf_appendbytes(rb->header, buf, bytes_used);
svn_stringbuf_appendbytes(rb->header, "\n", 1);
}
svn_stringbuf_appendcstr(rb->header, SVN_REPOS_DUMPFILE_CONTENT_LENGTH);
- bytes_used = sprintf(buf, ": %" APR_SIZE_T_FMT, props->len);
+ bytes_used = apr_snprintf(buf, sizeof(buf), ": %" APR_SIZE_T_FMT, props->len);
svn_stringbuf_appendbytes(rb->header, buf, bytes_used);
svn_stringbuf_appendbytes(rb->header, "\n", 1);
@@ -621,7 +622,8 @@
{
svn_stringbuf_appendcstr(nb->header,
SVN_REPOS_DUMPFILE_PROP_CONTENT_LENGTH);
- bytes_used = sprintf(buf, ": %" APR_SIZE_T_FMT, nb->props->len);
+ bytes_used = apr_snprintf(buf, sizeof(buf), ": %" APR_SIZE_T_FMT,
+ nb->props->len);
svn_stringbuf_appendbytes(nb->header, buf, bytes_used);
svn_stringbuf_appendbytes(nb->header, "\n", 1);
}
@@ -629,13 +631,14 @@
{
svn_stringbuf_appendcstr(nb->header,
SVN_REPOS_DUMPFILE_TEXT_CONTENT_LENGTH);
- bytes_used = sprintf(buf, ": %" SVN_FILESIZE_T_FMT, nb->tcl);
+ bytes_used = apr_snprintf(buf, sizeof(buf), ": %" SVN_FILESIZE_T_FMT,
+ nb->tcl);
svn_stringbuf_appendbytes(nb->header, buf, bytes_used);
svn_stringbuf_appendbytes(nb->header, "\n", 1);
}
svn_stringbuf_appendcstr(nb->header, SVN_REPOS_DUMPFILE_CONTENT_LENGTH);
- bytes_used = sprintf(buf, ": %" SVN_FILESIZE_T_FMT,
- (svn_filesize_t) (nb->props->len + nb->tcl));
+ bytes_used = apr_snprintf(buf, sizeof(buf), ": %" SVN_FILESIZE_T_FMT,
+ (svn_filesize_t) (nb->props->len + nb->tcl));
svn_stringbuf_appendbytes(nb->header, buf, bytes_used);
svn_stringbuf_appendbytes(nb->header, "\n", 1);
Modified: subversion/branches/issue-3242-dev/subversion/svndumpfilter/svndumpfilter.1
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/svndumpfilter/svndumpfilter.1?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/svndumpfilter/svndumpfilter.1 (original)
+++ subversion/branches/issue-3242-dev/subversion/svndumpfilter/svndumpfilter.1 Tue Dec 15 06:14:36 2009
@@ -1,3 +1,23 @@
+.\"
+.\"
+.\" 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 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
+.\"
+.\" http://www.apache.org/licenses/LICENSE-2.0
+.\"
+.\" Unless required by applicable law or agreed to in writing,
+.\" software distributed under the License is distributed on an
+.\" "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+.\" KIND, either express or implied. See the License for the
+.\" specific language governing permissions and limitations
+.\" under the License.
+.\"
+.\"
.\" You can view this file with:
.\" nroff -man [filename]
.\"
Modified: subversion/branches/issue-3242-dev/subversion/svnlook/main.c
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/svnlook/main.c?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/svnlook/main.c (original)
+++ subversion/branches/issue-3242-dev/subversion/svnlook/main.c Tue Dec 15 06:14:36 2009
@@ -2,10 +2,10 @@
* main.c: Subversion server inspection tool.
*
* ====================================================================
- * 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
@@ -530,13 +530,13 @@
/* Recursively handle the node's children. */
subpool = svn_pool_create(pool);
- full_path = svn_path_join(path, tmp_node->name, subpool);
+ full_path = svn_dirent_join(path, tmp_node->name, subpool);
SVN_ERR(print_dirs_changed_tree(tmp_node, full_path, subpool));
while (tmp_node->sibling)
{
svn_pool_clear(subpool);
tmp_node = tmp_node->sibling;
- full_path = svn_path_join(path, tmp_node->name, subpool);
+ full_path = svn_dirent_join(path, tmp_node->name, subpool);
SVN_ERR(print_dirs_changed_tree(tmp_node, full_path, subpool));
}
svn_pool_destroy(subpool);
@@ -609,13 +609,13 @@
/* Recursively handle the node's children. */
subpool = svn_pool_create(pool);
- full_path = svn_path_join(path, node->name, subpool);
+ full_path = svn_dirent_join(path, node->name, subpool);
SVN_ERR(print_changed_tree(node, full_path, copy_info, subpool));
while (node->sibling)
{
svn_pool_clear(subpool);
node = node->sibling;
- full_path = svn_path_join(path, node->name, subpool);
+ full_path = svn_dirent_join(path, node->name, subpool);
SVN_ERR(print_changed_tree(node, full_path, copy_info, subpool));
}
svn_pool_destroy(subpool);
@@ -1125,16 +1125,16 @@
/* Recursively handle the node's children. */
subpool = svn_pool_create(pool);
SVN_ERR(print_diff_tree(root, base_root, node,
- svn_path_join(path, node->name, subpool),
- svn_path_join(base_path, node->name, subpool),
+ svn_dirent_join(path, node->name, subpool),
+ svn_dirent_join(base_path, node->name, subpool),
c, tmpdir, subpool));
while (node->sibling)
{
svn_pool_clear(subpool);
node = node->sibling;
SVN_ERR(print_diff_tree(root, base_root, node,
- svn_path_join(path, node->name, subpool),
- svn_path_join(base_path, node->name, subpool),
+ svn_dirent_join(path, node->name, subpool),
+ svn_dirent_join(base_path, node->name, subpool),
c, tmpdir, subpool));
}
svn_pool_destroy(subpool);
Modified: subversion/branches/issue-3242-dev/subversion/svnlook/svnlook.1
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/svnlook/svnlook.1?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/svnlook/svnlook.1 (original)
+++ subversion/branches/issue-3242-dev/subversion/svnlook/svnlook.1 Tue Dec 15 06:14:36 2009
@@ -1,3 +1,23 @@
+.\"
+.\"
+.\" 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 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
+.\"
+.\" http://www.apache.org/licenses/LICENSE-2.0
+.\"
+.\" Unless required by applicable law or agreed to in writing,
+.\" software distributed under the License is distributed on an
+.\" "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+.\" KIND, either express or implied. See the License for the
+.\" specific language governing permissions and limitations
+.\" under the License.
+.\"
+.\"
.\" You can view this file with:
.\" nroff -man [filename]
.\"
Modified: subversion/branches/issue-3242-dev/subversion/svnserve/cyrus_auth.c
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/svnserve/cyrus_auth.c?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/svnserve/cyrus_auth.c (original)
+++ subversion/branches/issue-3242-dev/subversion/svnserve/cyrus_auth.c Tue Dec 15 06:14:36 2009
@@ -2,10 +2,10 @@
* sasl_auth.c : Functions for SASL-based authentication
*
* ====================================================================
- * 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/issue-3242-dev/subversion/svnserve/log-escape.c
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/svnserve/log-escape.c?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/svnserve/log-escape.c (original)
+++ subversion/branches/issue-3242-dev/subversion/svnserve/log-escape.c Tue Dec 15 06:14:36 2009
@@ -19,10 +19,10 @@
* limitations under the License.
*
* ====================================================================
- * 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/issue-3242-dev/subversion/svnserve/main.c
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/svnserve/main.c?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/svnserve/main.c (original)
+++ subversion/branches/issue-3242-dev/subversion/svnserve/main.c Tue Dec 15 06:14:36 2009
@@ -2,10 +2,10 @@
* main.c : Main control function for svnserve
*
* ====================================================================
- * 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/issue-3242-dev/subversion/svnserve/serve.c
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/svnserve/serve.c?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/svnserve/serve.c (original)
+++ subversion/branches/issue-3242-dev/subversion/svnserve/serve.c Tue Dec 15 06:14:36 2009
@@ -2,10 +2,10 @@
* serve.c : Functions for serving the Subversion protocol
*
* ====================================================================
- * 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/issue-3242-dev/subversion/svnserve/server.h
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/svnserve/server.h?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/svnserve/server.h (original)
+++ subversion/branches/issue-3242-dev/subversion/svnserve/server.h Tue Dec 15 06:14:36 2009
@@ -2,10 +2,10 @@
* svn_server.h : declarations for the svn server
*
* ====================================================================
- * 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/issue-3242-dev/subversion/svnserve/svnserve.8
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/svnserve/svnserve.8?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/svnserve/svnserve.8 (original)
+++ subversion/branches/issue-3242-dev/subversion/svnserve/svnserve.8 Tue Dec 15 06:14:36 2009
@@ -1,3 +1,23 @@
+.\"
+.\"
+.\" 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 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
+.\"
+.\" http://www.apache.org/licenses/LICENSE-2.0
+.\"
+.\" Unless required by applicable law or agreed to in writing,
+.\" software distributed under the License is distributed on an
+.\" "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+.\" KIND, either express or implied. See the License for the
+.\" specific language governing permissions and limitations
+.\" under the License.
+.\"
+.\"
.\" You can view this file with:
.\" nroff -man [filename]
.\"
Modified: subversion/branches/issue-3242-dev/subversion/svnserve/svnserve.conf.5
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/svnserve/svnserve.conf.5?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/svnserve/svnserve.conf.5 (original)
+++ subversion/branches/issue-3242-dev/subversion/svnserve/svnserve.conf.5 Tue Dec 15 06:14:36 2009
@@ -1,3 +1,23 @@
+.\"
+.\"
+.\" 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 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
+.\"
+.\" http://www.apache.org/licenses/LICENSE-2.0
+.\"
+.\" Unless required by applicable law or agreed to in writing,
+.\" software distributed under the License is distributed on an
+.\" "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+.\" KIND, either express or implied. See the License for the
+.\" specific language governing permissions and limitations
+.\" under the License.
+.\"
+.\"
.\" You can view this file with:
.\" nroff -man [filename]
.\"
Modified: subversion/branches/issue-3242-dev/subversion/svnserve/winservice.c
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/svnserve/winservice.c?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/svnserve/winservice.c (original)
+++ subversion/branches/issue-3242-dev/subversion/svnserve/winservice.c Tue Dec 15 06:14:36 2009
@@ -2,10 +2,10 @@
* winservice.c : Implementation of Windows Service support
*
* ====================================================================
- * 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/issue-3242-dev/subversion/svnserve/winservice.h
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/svnserve/winservice.h?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/svnserve/winservice.h (original)
+++ subversion/branches/issue-3242-dev/subversion/svnserve/winservice.h Tue Dec 15 06:14:36 2009
@@ -2,10 +2,10 @@
* winservice.h : Public definitions for Windows Service support
*
* ====================================================================
- * 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/issue-3242-dev/subversion/svnsync/main.c
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/svnsync/main.c?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/svnsync/main.c (original)
+++ subversion/branches/issue-3242-dev/subversion/svnsync/main.c Tue Dec 15 06:14:36 2009
@@ -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
@@ -179,7 +179,7 @@
" "
"For example:\n"
" "
- " servers:global:http-library=serf\n")},
+ " servers:global:http-library=serf")},
{"version", svnsync_opt_version, 0,
N_("show program version information")},
{"help", 'h', 0,
@@ -276,7 +276,8 @@
subpool = svn_pool_create(pool);
- for (i = 0; i < 10; ++i)
+#define SVNSYNC_LOCK_RETRIES 10
+ for (i = 0; i < SVNSYNC_LOCK_RETRIES; ++i)
{
svn_pool_clear(subpool);
SVN_ERR(check_cancel(NULL));
@@ -299,8 +300,9 @@
apr_sleep(apr_time_from_sec(1));
}
}
- else
+ else if (i < SVNSYNC_LOCK_RETRIES - 1)
{
+ /* Except in the very last iteration, try to set the lock. */
SVN_ERR(svn_ra_change_rev_prop(session, 0, SVNSYNC_PROP_LOCK,
mylocktoken, subpool));
}
Modified: subversion/branches/issue-3242-dev/subversion/svnsync/svnsync.1
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/svnsync/svnsync.1?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/svnsync/svnsync.1 (original)
+++ subversion/branches/issue-3242-dev/subversion/svnsync/svnsync.1 Tue Dec 15 06:14:36 2009
@@ -1,3 +1,23 @@
+.\"
+.\"
+.\" 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 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
+.\"
+.\" http://www.apache.org/licenses/LICENSE-2.0
+.\"
+.\" Unless required by applicable law or agreed to in writing,
+.\" software distributed under the License is distributed on an
+.\" "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+.\" KIND, either express or implied. See the License for the
+.\" specific language governing permissions and limitations
+.\" under the License.
+.\"
+.\"
.\" You can view this file with:
.\" nroff -man [filename]
.\"
Modified: subversion/branches/issue-3242-dev/subversion/svnsync/sync.c
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/svnsync/sync.c?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/svnsync/sync.c (original)
+++ subversion/branches/issue-3242-dev/subversion/svnsync/sync.c Tue Dec 15 06:14:36 2009
@@ -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/issue-3242-dev/subversion/svnsync/sync.h
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/svnsync/sync.h?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/svnsync/sync.h (original)
+++ subversion/branches/issue-3242-dev/subversion/svnsync/sync.h Tue Dec 15 06:14:36 2009
@@ -2,10 +2,10 @@
* sync.h : The synchronization editor for svnsync.
*
* ====================================================================
- * 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/issue-3242-dev/subversion/svnversion/main.c
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/svnversion/main.c?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/svnversion/main.c (original)
+++ subversion/branches/issue-3242-dev/subversion/svnversion/main.c Tue Dec 15 06:14:36 2009
@@ -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/issue-3242-dev/subversion/svnversion/svnversion.1
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/svnversion/svnversion.1?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/svnversion/svnversion.1 (original)
+++ subversion/branches/issue-3242-dev/subversion/svnversion/svnversion.1 Tue Dec 15 06:14:36 2009
@@ -1,3 +1,23 @@
+.\"
+.\"
+.\" 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 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
+.\"
+.\" http://www.apache.org/licenses/LICENSE-2.0
+.\"
+.\" Unless required by applicable law or agreed to in writing,
+.\" software distributed under the License is distributed on an
+.\" "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+.\" KIND, either express or implied. See the License for the
+.\" specific language governing permissions and limitations
+.\" under the License.
+.\"
+.\"
.\" You can view this file with:
.\" nroff -man [filename]
.\"
Modified: subversion/branches/issue-3242-dev/subversion/tests/cmdline/authz_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/tests/cmdline/authz_tests.py?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/tests/cmdline/authz_tests.py (original)
+++ subversion/branches/issue-3242-dev/subversion/tests/cmdline/authz_tests.py Tue Dec 15 06:14:36 2009
@@ -6,10 +6,10 @@
# See http://subversion.tigris.org for more information.
#
# ====================================================================
-# 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/issue-3242-dev/subversion/tests/cmdline/autoprop_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/tests/cmdline/autoprop_tests.py?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/tests/cmdline/autoprop_tests.py (original)
+++ subversion/branches/issue-3242-dev/subversion/tests/cmdline/autoprop_tests.py Tue Dec 15 06:14:36 2009
@@ -6,10 +6,10 @@
# See http://subversion.tigris.org for more information.
#
# ====================================================================
-# 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/issue-3242-dev/subversion/tests/cmdline/basic_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/tests/cmdline/basic_tests.py?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/tests/cmdline/basic_tests.py (original)
+++ subversion/branches/issue-3242-dev/subversion/tests/cmdline/basic_tests.py Tue Dec 15 06:14:36 2009
@@ -6,10 +6,10 @@
# See http://subversion.tigris.org for more information.
#
# ====================================================================
-# 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
@@ -34,6 +34,7 @@
# (abbreviation)
Skip = svntest.testcase.Skip
XFail = svntest.testcase.XFail
+Wimp = svntest.testcase.Wimp
Item = wc.StateItem
######################################################################
@@ -325,6 +326,15 @@
svntest.actions.run_and_verify_svn("mkdir dir/subdir", None, [],
'mkdir', '--parents', Y_Z_path)
+ # Verify the WC status, because there was a regression in which parts of
+ # the WC were left locked.
+ expected_status = svntest.actions.get_virginal_state(sbox.wc_dir, 1)
+ expected_status.add({
+ 'Y' : Item(status='A ', wc_rev=0),
+ 'Y/Z' : Item(status='A ', wc_rev=0),
+ })
+ svntest.actions.run_and_verify_status(wc_dir, expected_status)
+
#----------------------------------------------------------------------
def basic_corruption(sbox):
@@ -2481,7 +2491,8 @@
basic_update,
basic_mkdir_url,
basic_mkdir_url_with_parents,
- basic_mkdir_wc_with_parents,
+ Wimp("currently, WC locks are being left behind",
+ basic_mkdir_wc_with_parents),
basic_corruption,
basic_merging_update,
basic_conflict,
Modified: subversion/branches/issue-3242-dev/subversion/tests/cmdline/blame_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/tests/cmdline/blame_tests.py?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/tests/cmdline/blame_tests.py (original)
+++ subversion/branches/issue-3242-dev/subversion/tests/cmdline/blame_tests.py Tue Dec 15 06:14:36 2009
@@ -6,10 +6,10 @@
# See http://subversion.tigris.org for more information.
#
# ====================================================================
-# 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/issue-3242-dev/subversion/tests/cmdline/cat_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/tests/cmdline/cat_tests.py?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/tests/cmdline/cat_tests.py (original)
+++ subversion/branches/issue-3242-dev/subversion/tests/cmdline/cat_tests.py Tue Dec 15 06:14:36 2009
@@ -6,10 +6,10 @@
# See http://subversion.tigris.org for more information.
#
# ====================================================================
-# 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/issue-3242-dev/subversion/tests/cmdline/changelist_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/tests/cmdline/changelist_tests.py?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/tests/cmdline/changelist_tests.py (original)
+++ subversion/branches/issue-3242-dev/subversion/tests/cmdline/changelist_tests.py Tue Dec 15 06:14:36 2009
@@ -6,10 +6,10 @@
# See http://subversion.tigris.org for more information.
#
# ====================================================================
-# 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/issue-3242-dev/subversion/tests/cmdline/checkout_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/tests/cmdline/checkout_tests.py?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/tests/cmdline/checkout_tests.py (original)
+++ subversion/branches/issue-3242-dev/subversion/tests/cmdline/checkout_tests.py Tue Dec 15 06:14:36 2009
@@ -7,10 +7,10 @@
# See http://subversion.tigris.org for more information.
#
# ====================================================================
-# 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/issue-3242-dev/subversion/tests/cmdline/commit_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/tests/cmdline/commit_tests.py?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/tests/cmdline/commit_tests.py (original)
+++ subversion/branches/issue-3242-dev/subversion/tests/cmdline/commit_tests.py Tue Dec 15 06:14:36 2009
@@ -6,10 +6,10 @@
# See http://subversion.tigris.org for more information.
#
# ====================================================================
-# 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/issue-3242-dev/subversion/tests/cmdline/copy_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/tests/cmdline/copy_tests.py?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/tests/cmdline/copy_tests.py (original)
+++ subversion/branches/issue-3242-dev/subversion/tests/cmdline/copy_tests.py Tue Dec 15 06:14:36 2009
@@ -6,10 +6,10 @@
# See http://subversion.tigris.org for more information.
#
# ====================================================================
-# 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
@@ -4132,11 +4132,6 @@
svntest.actions.run_and_verify_svn(None, None, [],
'cp', a, new_a)
- ### svn: Commit succeeded, but other errors follow:
- ### svn: Error bumping revisions post-commit (details follow):
- ### svn: Unable to lock '<snip>\new_A\B'
-
- # Then the working copy is locked and can't be unlocked with svn cleanup.
svntest.actions.run_and_verify_svn(None, None, [], 'ci',
new_a, '--depth', 'empty',
'-m', 'Copied directory')
@@ -4355,7 +4350,7 @@
find_copyfrom_information_upstairs,
path_move_and_copy_between_wcs_2475,
path_copy_in_repo_2475,
- XFail(commit_copy_depth_empty),
+ commit_copy_depth_empty,
copy_below_copy,
XFail(move_below_move)
]
Modified: subversion/branches/issue-3242-dev/subversion/tests/cmdline/davautocheck.sh
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/tests/cmdline/davautocheck.sh?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/tests/cmdline/davautocheck.sh (original)
+++ subversion/branches/issue-3242-dev/subversion/tests/cmdline/davautocheck.sh Tue Dec 15 06:14:36 2009
@@ -1,4 +1,24 @@
#!/bin/bash
+#
+#
+# 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 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
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#
# -*- mode: shell-script; -*-
# $Id$
Modified: subversion/branches/issue-3242-dev/subversion/tests/cmdline/depth_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/tests/cmdline/depth_tests.py?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/tests/cmdline/depth_tests.py (original)
+++ subversion/branches/issue-3242-dev/subversion/tests/cmdline/depth_tests.py Tue Dec 15 06:14:36 2009
@@ -8,10 +8,10 @@
# See http://subversion.tigris.org for more information.
#
# ====================================================================
-# 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
@@ -2056,6 +2056,7 @@
B_path = os.path.join(A_path, 'B')
L_path = os.path.join(A_path, 'L')
E_path = os.path.join(B_path, 'E')
+ iota_path = os.path.join(wc_dir, 'iota')
# Simply exclude a subtree
expected_output = svntest.wc.State(wc_dir, {
@@ -2131,6 +2132,38 @@
None, None, None, None,
B_path)
+ # Test issue #
+ # Exclude a file then set depth of WC to infinity, the file should return.
+ expected_output = svntest.wc.State(wc_dir, {
+ 'iota' : Item(status='D '),
+ })
+ expected_status.remove('iota');
+ expected_disk.remove('iota');
+ svntest.actions.run_and_verify_update(wc_dir,
+ expected_output,
+ expected_disk,
+ expected_status,
+ None, None,
+ None, None, None, None,
+ '--set-depth', 'exclude', iota_path)
+
+ # Update the whole WC to depth=infinity.
+ expected_output = svntest.wc.State(wc_dir, {
+ 'iota' : Item(status='A '),
+ })
+ expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
+ expected_disk = svntest.main.greek_state.copy()
+ # This update currently fails when iota is reported as added, but shows in
+ # status as unversioned. See issue #3544 'svn update does not restore
+ # excluded files'. This test is marked as XFail until that issue is fixed.
+ svntest.actions.run_and_verify_update(wc_dir,
+ expected_output,
+ expected_disk,
+ expected_status,
+ None, None,
+ None, None, None, None,
+ '--set-depth', 'infinity', wc_dir)
+
def excluded_path_misc_operation(sbox):
"""make sure other subcommands handle exclude"""
@@ -2504,7 +2537,7 @@
pull_in_tree_with_depth_option,
fold_tree_with_unversioned_modified_items,
depth_empty_update_on_file,
- excluded_path_update_operation,
+ XFail(excluded_path_update_operation),
excluded_path_misc_operation,
excluded_receive_remote_removal,
exclude_keeps_hidden_entries,
Modified: subversion/branches/issue-3242-dev/subversion/tests/cmdline/diff_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/tests/cmdline/diff_tests.py?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/tests/cmdline/diff_tests.py (original)
+++ subversion/branches/issue-3242-dev/subversion/tests/cmdline/diff_tests.py Tue Dec 15 06:14:36 2009
@@ -7,10 +7,10 @@
# See http://subversion.tigris.org for more information.
#
# ====================================================================
-# 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
@@ -1476,7 +1476,7 @@
'M') :
raise svntest.Failure
- # Repos->WC diff of the file ignoring copyfrom
+ # Repos->WC diff of the file showing copies as adds
exit_code, diff_output, err_output = svntest.main.run_svn(
None, 'diff', '-r', '1',
'--show-copies-as-adds', pi2_path)
@@ -1487,7 +1487,7 @@
svntest.main.file_append(pi2_path, "new pi")
- # Repos->WC of the directory
+ # Repos->WC of the containing directory
exit_code, diff_output, err_output = svntest.main.run_svn(
None, 'diff', '-r', '1', os.path.join('A', 'D'))
@@ -1501,7 +1501,7 @@
'M') :
raise svntest.Failure
- # Repos->WC of the directory ignoring copyfrom
+ # Repos->WC of the containing directory showing copies as adds
exit_code, diff_output, err_output = svntest.main.run_svn(
None, 'diff', '-r', '1', '--show-copies-as-adds', os.path.join('A', 'D'))
@@ -1523,7 +1523,7 @@
'M') :
raise svntest.Failure
- # WC->WC of the file ignoring copyfrom
+ # WC->WC of the file showing copies as adds
exit_code, diff_output, err_output = svntest.main.run_svn(
None, 'diff',
'--show-copies-as-adds', pi2_path)
Modified: subversion/branches/issue-3242-dev/subversion/tests/cmdline/entries-dump.c
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/tests/cmdline/entries-dump.c?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/tests/cmdline/entries-dump.c (original)
+++ subversion/branches/issue-3242-dev/subversion/tests/cmdline/entries-dump.c Tue Dec 15 06:14:36 2009
@@ -2,10 +2,10 @@
* db-test.c : test the wc_db subsystem
*
* ====================================================================
- * 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/issue-3242-dev/subversion/tests/cmdline/entries_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/tests/cmdline/entries_tests.py?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/tests/cmdline/entries_tests.py (original)
+++ subversion/branches/issue-3242-dev/subversion/tests/cmdline/entries_tests.py Tue Dec 15 06:14:36 2009
@@ -6,10 +6,10 @@
# See http://subversion.tigris.org for more information.
#
# ====================================================================
-# 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/issue-3242-dev/subversion/tests/cmdline/export_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/tests/cmdline/export_tests.py?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/tests/cmdline/export_tests.py (original)
+++ subversion/branches/issue-3242-dev/subversion/tests/cmdline/export_tests.py Tue Dec 15 06:14:36 2009
@@ -6,10 +6,10 @@
# See http://subversion.tigris.org for more information.
#
# ====================================================================
-# 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/issue-3242-dev/subversion/tests/cmdline/externals_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/tests/cmdline/externals_tests.py?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/tests/cmdline/externals_tests.py (original)
+++ subversion/branches/issue-3242-dev/subversion/tests/cmdline/externals_tests.py Tue Dec 15 06:14:36 2009
@@ -6,10 +6,10 @@
# See http://subversion.tigris.org for more information.
#
# ====================================================================
-# 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
@@ -398,6 +398,10 @@
# Set and commit the property
change_external(os.path.join(wc_dir, "A/D"), new_externals_desc)
+ # The code should handle a missing local externals item
+ svntest.main.safe_rmtree(os.path.join(other_wc_dir, "A", "D", "exdir_A", \
+ "D"))
+
# Update other working copy, see if lose & preserve things appropriately
svntest.actions.run_and_verify_svn(None, None, [], 'up', other_wc_dir)
@@ -1396,6 +1400,62 @@
svntest.main.safe_rmtree(export_target)
+#----------------------------------------------------------------------
+
+# Change external from one repo to another
+def relegate_external(sbox):
+ "relegate external from one repo to another"
+
+ sbox.build()
+ wc_dir = sbox.wc_dir
+ repo_dir = sbox.repo_dir
+ repo_url = sbox.repo_url
+ A_path = os.path.join(wc_dir, 'A')
+
+ # setup an external within the same repository
+ externals_desc = '^/A/B/E external'
+ change_external(A_path, externals_desc)
+ svntest.actions.run_and_verify_svn(None, None, [],
+ 'up',
+ repo_url, wc_dir)
+
+ # create another repository
+ other_repo_dir, other_repo_url = sbox.add_repo_path('other')
+ svntest.main.copy_repos(repo_dir, other_repo_dir, 2)
+
+ # point external to the other repository
+ externals_desc = other_repo_url + '/A/B/E external\n'
+ (fd, tmp_f) = tempfile.mkstemp()
+ svntest.main.file_append(tmp_f, externals_desc)
+ svntest.actions.run_and_verify_svn(None, None, [],
+ 'pset', '-F', tmp_f,
+ 'svn:externals', A_path)
+
+ # Update "relegates", i.e. throws-away and recreates, the external
+ expected_output = svntest.wc.State(wc_dir, {
+ 'A/external' : Item(), # No A?
+ 'A/external/alpha' : Item(status='A '),
+ 'A/external/beta' : Item(status='A '),
+ })
+ expected_disk = svntest.main.greek_state.copy()
+ expected_disk.tweak('A', props={'svn:externals' : externals_desc})
+ expected_disk.add({
+ 'A/external' : Item(),
+ 'A/external/alpha' : Item('This is the file \'alpha\'.\n'),
+ 'A/external/beta' : Item('This is the file \'beta\'.\n'),
+ })
+ expected_status = svntest.actions.get_virginal_state(wc_dir, 2)
+ expected_status.tweak('A', status=' M')
+ svntest.actions.run_and_verify_update(wc_dir,
+ expected_output,
+ expected_disk,
+ expected_status,
+ None, None, None, None, None,
+ True)
+
+ ### TODO: Commit the propset and update a pristine working copy from
+ ### r2 to r3.
+
########################################################################
# Run the tests
@@ -1423,6 +1483,7 @@
XFail(update_lose_file_external),
XFail(switch_relative_external),
export_sparse_wc_with_externals,
+ relegate_external,
]
if __name__ == '__main__':
Modified: subversion/branches/issue-3242-dev/subversion/tests/cmdline/getopt_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/tests/cmdline/getopt_tests.py?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/tests/cmdline/getopt_tests.py (original)
+++ subversion/branches/issue-3242-dev/subversion/tests/cmdline/getopt_tests.py Tue Dec 15 06:14:36 2009
@@ -6,10 +6,10 @@
# See http://subversion.tigris.org for more information.
#
# ====================================================================
-# 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/issue-3242-dev/subversion/tests/cmdline/getopt_tests_data/svn--version_stdout
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/tests/cmdline/getopt_tests_data/svn--version_stdout?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/tests/cmdline/getopt_tests_data/svn--version_stdout (original)
+++ subversion/branches/issue-3242-dev/subversion/tests/cmdline/getopt_tests_data/svn--version_stdout Tue Dec 15 06:14:36 2009
@@ -1,10 +1,10 @@
svn, version 0.16.0 (r3987)
compiled Dec 5 2002, 00:02:51
-Copyright (C) 2009 The Subversion Corporation.
+Copyright (C) 2009 The Apache Software Foundation.
This software consists of contributions made by many people;
see the NOTICE file for more information.
-Subversion is open source software, see http://subversion.tigris.org/
+Subversion is open source software, see http://subversion.apache.org/
The following repository access (RA) modules are available:
Modified: subversion/branches/issue-3242-dev/subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout (original)
+++ subversion/branches/issue-3242-dev/subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout Tue Dec 15 06:14:36 2009
@@ -66,7 +66,6 @@
For example:
servers:global:http-library=serf
-
switch (sw): Update the working copy to a different URL.
usage: 1. switch URL[@PEGREV] [PATH]
2. switch --relocate FROM TO [PATH...]
@@ -89,9 +88,7 @@
are applied to the obstructing path.
Use the --set-depth option to set a new working copy depth on the
- targets of this operation. Currently, the depth of a working copy
- directory can only be increased (telescoped more deeply); you cannot
- make a directory more shallow.
+ targets of this operation.
2. Rewrite working copy URL metadata to reflect a syntactic change only.
This is used when repository's root URL changes (such as a scheme
@@ -150,4 +147,3 @@
For example:
servers:global:http-library=serf
-
Modified: subversion/branches/issue-3242-dev/subversion/tests/cmdline/history_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/tests/cmdline/history_tests.py?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/tests/cmdline/history_tests.py (original)
+++ subversion/branches/issue-3242-dev/subversion/tests/cmdline/history_tests.py Tue Dec 15 06:14:36 2009
@@ -6,10 +6,10 @@
# See http://subversion.tigris.org for more information.
#
# ====================================================================
-# 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/issue-3242-dev/subversion/tests/cmdline/import_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/tests/cmdline/import_tests.py?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/tests/cmdline/import_tests.py (original)
+++ subversion/branches/issue-3242-dev/subversion/tests/cmdline/import_tests.py Tue Dec 15 06:14:36 2009
@@ -6,10 +6,10 @@
# See http://subversion.tigris.org for more information.
#
# ====================================================================
-# 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