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 [37/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/tests/libsvn_fs_fs/fs-pack-test.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/tests/libsvn_fs_fs/fs-pack-test.c?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/tests/libsvn_fs_fs/fs-pack-test.c (original)
+++ subversion/branches/ignore-mergeinfo/subversion/tests/libsvn_fs_fs/fs-pack-test.c Tue Aug 10 17:03:06 2010
@@ -1,10 +1,10 @@
/* fs-pack-test.c --- tests for the filesystem
*
* ====================================================================
- * 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
@@ -28,6 +28,7 @@
#include "../../libsvn_fs_fs/fs.h"
#include "svn_pools.h"
+#include "svn_props.h"
#include "svn_fs.h"
#include "../svn_test_fs.h"
@@ -341,6 +342,52 @@ commit_packed_fs(const svn_test_opts_t *
}
#undef REPO_NAME
+/* Get/set revprop while repository is being packed in background. */
+#define REPO_NAME "test-get-set-revprop-packed-fs"
+#define SHARD_SIZE 4
+#define MAX_REV 1
+static svn_error_t *
+get_set_revprop_packed_fs(const svn_test_opts_t *opts,
+ apr_pool_t *pool)
+{
+ svn_fs_t *fs;
+ svn_fs_txn_t *txn;
+ svn_fs_root_t *txn_root;
+ const char *conflict;
+ svn_revnum_t after_rev;
+ svn_string_t *prop_value;
+ apr_pool_t *subpool;
+
+ /* Bail (with success) on known-untestable scenarios */
+ if ((strcmp(opts->fs_type, "fsfs") != 0)
+ || (opts->server_minor_version && (opts->server_minor_version < 7)))
+ return SVN_NO_ERROR;
+
+ /* Create the packed FS and open it. */
+ SVN_ERR(create_packed_filesystem(REPO_NAME, opts, MAX_REV, SHARD_SIZE, pool));
+ SVN_ERR(svn_fs_open(&fs, REPO_NAME, NULL, pool));
+
+ subpool = svn_pool_create(pool);
+ /* Do a commit to trigger packing. */
+ SVN_ERR(svn_fs_begin_txn(&txn, fs, MAX_REV + 1, subpool));
+ SVN_ERR(svn_fs_txn_root(&txn_root, txn, subpool));
+ SVN_ERR(svn_test__set_file_contents(txn_root, "iota", "new-iota", subpool));
+ SVN_ERR(svn_fs_commit_txn(&conflict, &after_rev, txn, subpool));
+ svn_pool_clear(subpool);
+
+ /* Pack the repository. */
+ SVN_ERR(svn_fs_pack(REPO_NAME, NULL, NULL, NULL, NULL, pool));
+
+ /* Try to get revprop for revision 0. */
+ SVN_ERR(svn_fs_revision_prop(&prop_value, fs, 0, SVN_PROP_REVISION_AUTHOR, pool));
+
+ /* Try to change revprop for revision 0. */
+ SVN_ERR(svn_fs_change_rev_prop(fs, 0, SVN_PROP_REVISION_AUTHOR,
+ svn_string_create("tweaked-author", pool), pool));
+
+ return SVN_NO_ERROR;
+}
+
/* ------------------------------------------------------------------------ */
/* The test table. */
@@ -356,5 +403,7 @@ struct svn_test_descriptor_t test_funcs[
"read from a packed FSFS filesystem"),
SVN_TEST_OPTS_PASS(commit_packed_fs,
"commit to a packed FSFS filesystem"),
+ SVN_TEST_OPTS_PASS(get_set_revprop_packed_fs,
+ "get/set revprop while packing FSFS filesystem"),
SVN_TEST_NULL
};
Modified: subversion/branches/ignore-mergeinfo/subversion/tests/libsvn_ra_local/ra-local-test.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/tests/libsvn_ra_local/ra-local-test.c?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/tests/libsvn_ra_local/ra-local-test.c (original)
+++ subversion/branches/ignore-mergeinfo/subversion/tests/libsvn_ra_local/ra-local-test.c Tue Aug 10 17:03:06 2010
@@ -2,10 +2,10 @@
* ra-local-test.c : basic tests for the RA LOCAL 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
Modified: subversion/branches/ignore-mergeinfo/subversion/tests/libsvn_repos/dir-delta-editor.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/tests/libsvn_repos/dir-delta-editor.c?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/tests/libsvn_repos/dir-delta-editor.c (original)
+++ subversion/branches/ignore-mergeinfo/subversion/tests/libsvn_repos/dir-delta-editor.c Tue Aug 10 17:03:06 2010
@@ -2,10 +2,10 @@
* svn_tests_editor.c: a `dummy' editor implementation for testing
*
* ====================================================================
- * 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/tests/libsvn_repos/dir-delta-editor.h
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/tests/libsvn_repos/dir-delta-editor.h?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/tests/libsvn_repos/dir-delta-editor.h (original)
+++ subversion/branches/ignore-mergeinfo/subversion/tests/libsvn_repos/dir-delta-editor.h Tue Aug 10 17:03:06 2010
@@ -2,10 +2,10 @@
* svn_tests_editor.c: a `dummy' editor implementation for testing
*
* ====================================================================
- * 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/tests/libsvn_repos/repos-test.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/tests/libsvn_repos/repos-test.c?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/tests/libsvn_repos/repos-test.c (original)
+++ subversion/branches/ignore-mergeinfo/subversion/tests/libsvn_repos/repos-test.c Tue Aug 10 17:03:06 2010
@@ -1,10 +1,10 @@
/* repos-test.c --- tests for the filesystem
*
* ====================================================================
- * 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/tests/libsvn_subr/auth-test.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/tests/libsvn_subr/auth-test.c?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/tests/libsvn_subr/auth-test.c (original)
+++ subversion/branches/ignore-mergeinfo/subversion/tests/libsvn_subr/auth-test.c Tue Aug 10 17:03:06 2010
@@ -2,10 +2,10 @@
* auth-test.c -- test the auth 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/tests/libsvn_subr/cache-test.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/tests/libsvn_subr/cache-test.c?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/tests/libsvn_subr/cache-test.c (original)
+++ subversion/branches/ignore-mergeinfo/subversion/tests/libsvn_subr/cache-test.c Tue Aug 10 17:03:06 2010
@@ -2,10 +2,10 @@
* cache-test.c -- test the in-memory cache
*
* ====================================================================
- * 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/tests/libsvn_subr/checksum-test.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/tests/libsvn_subr/checksum-test.c?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/tests/libsvn_subr/checksum-test.c (original)
+++ subversion/branches/ignore-mergeinfo/subversion/tests/libsvn_subr/checksum-test.c Tue Aug 10 17:03:06 2010
@@ -2,10 +2,10 @@
* checksum-test.c: tests checksum 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/tests/libsvn_subr/compat-test.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/tests/libsvn_subr/compat-test.c?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/tests/libsvn_subr/compat-test.c (original)
+++ subversion/branches/ignore-mergeinfo/subversion/tests/libsvn_subr/compat-test.c Tue Aug 10 17:03:06 2010
@@ -2,10 +2,10 @@
* compat-test.c: tests svn_ver_compatible
*
* ====================================================================
- * 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/tests/libsvn_subr/config-test.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/tests/libsvn_subr/config-test.c?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/tests/libsvn_subr/config-test.c (original)
+++ subversion/branches/ignore-mergeinfo/subversion/tests/libsvn_subr/config-test.c Tue Aug 10 17:03:06 2010
@@ -2,10 +2,10 @@
* config-test.c: tests svn_config
*
* ====================================================================
- * 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/tests/libsvn_subr/dirent_uri-test.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/tests/libsvn_subr/dirent_uri-test.c?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/tests/libsvn_subr/dirent_uri-test.c (original)
+++ subversion/branches/ignore-mergeinfo/subversion/tests/libsvn_subr/dirent_uri-test.c Tue Aug 10 17:03:06 2010
@@ -2,10 +2,10 @@
* dirent_uri-test.c -- test the directory entry and URI 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
@@ -141,7 +141,7 @@ test_dirent_is_absolute(apr_pool_t *pool
struct {
const char *path;
svn_boolean_t result;
- } tests[] = {
+ } tests[] = {
{ "foo/bar", FALSE },
{ "foo", FALSE },
{ "", FALSE },
@@ -388,7 +388,7 @@ test_dirent_join(apr_pool_t *pool)
TEST_MANY((pool, "abcd", "/dir", "A:", "file", NULL), "A:file");
TEST_MANY((pool, "abcd", "A:", "/dir", "file", NULL), "A:/dir/file");
-
+
#else /* WIN32 or Cygwin */
TEST_MANY((pool, "X:", "def", "ghi", NULL), "X:/def/ghi");
TEST_MANY((pool, "X:", SVN_EMPTY_PATH, "ghi", NULL), "X:/ghi");
@@ -2303,6 +2303,38 @@ test_dirent_get_absolute(apr_pool_t *poo
return SVN_NO_ERROR;
}
+#ifdef WIN32
+static svn_error_t *
+test_dirent_get_absolute_from_lc_drive(apr_pool_t *pool)
+{
+ char current_dir[1024];
+ char current_dir_on_C[1024];
+ char *dir_on_c;
+ svn_error_t *err;
+
+ if (! getcwd(current_dir, sizeof(current_dir)))
+ return svn_error_create(SVN_ERR_BASE, NULL, "getcwd() failed");
+
+ /* 3 stands for drive C: */
+ if (! getdcwd(3, current_dir_on_C, sizeof(current_dir_on_C)))
+ return svn_error_create(SVN_ERR_BASE, NULL, "getdcwd() failed");
+
+ /* Use the same path, but now with a lower case driveletter */
+ dir_on_c = apr_pstrdup(pool, current_dir_on_C);
+ dir_on_c[0] = (char)tolower(dir_on_c[0]);
+
+ chdir(dir_on_c);
+
+ err = test_dirent_get_absolute(pool);
+
+ /* Change back to original directory for next tests */
+ chdir("C:\\"); /* Switch to upper case */
+ chdir(current_dir_on_C); /* Switch cwd on C: */
+ chdir(current_dir); /* Switch back to original cwd */
+ return err;
+}
+#endif
+
static svn_error_t *
test_dirent_condense_targets(apr_pool_t *pool)
{
@@ -2342,7 +2374,7 @@ test_dirent_condense_targets(apr_pool_t
break;
}
- SVN_ERR(svn_dirent_condense_targets(&common, &condensed, hdr,
+ SVN_ERR(svn_dirent_condense_targets(&common, &condensed, hdr,
FALSE, pool, pool));
if (tests[i].common != NULL && strcmp(common, tests[i].common))
@@ -2356,7 +2388,7 @@ test_dirent_condense_targets(apr_pool_t
if (tests[i].paths[j] == NULL || tests[i].results[j] == NULL)
break;
- if (strcmp(APR_ARRAY_IDX(condensed, j, const char*),
+ if (strcmp(APR_ARRAY_IDX(condensed, j, const char*),
tests[i].results[j]))
return svn_error_createf(SVN_ERR_TEST_FAILED, NULL,
"svn_dirent_condense_targets returned first"
@@ -2366,7 +2398,7 @@ test_dirent_condense_targets(apr_pool_t
}
}
-
+
return SVN_NO_ERROR;
}
@@ -2407,7 +2439,7 @@ test_uri_condense_targets(apr_pool_t *po
break;
}
- SVN_ERR(svn_uri_condense_targets(&common, &condensed, hdr,
+ SVN_ERR(svn_uri_condense_targets(&common, &condensed, hdr,
FALSE, pool, pool));
if (tests[i].common != NULL && strcmp(common, tests[i].common))
@@ -2421,7 +2453,7 @@ test_uri_condense_targets(apr_pool_t *po
if (tests[i].paths[j] == NULL || tests[i].results[j] == NULL)
break;
- if (strcmp(APR_ARRAY_IDX(condensed, j, const char*),
+ if (strcmp(APR_ARRAY_IDX(condensed, j, const char*),
tests[i].results[j]))
return svn_error_createf(SVN_ERR_TEST_FAILED, NULL,
"svn_uri_condense_targets returned first"
@@ -2431,7 +2463,7 @@ test_uri_condense_targets(apr_pool_t *po
}
}
-
+
return SVN_NO_ERROR;
}
@@ -2672,6 +2704,10 @@ struct svn_test_descriptor_t test_funcs[
"test test_uri_skip_ancestor"),
SVN_TEST_PASS2(test_dirent_get_absolute,
"test svn_dirent_get_absolute"),
+#ifdef WIN32
+ SVN_TEST_XFAIL2(test_dirent_get_absolute_from_lc_drive,
+ "test svn_dirent_get_absolute with lc drive"),
+#endif
SVN_TEST_PASS2(test_dirent_condense_targets,
"test svn_dirent_condense_targets"),
SVN_TEST_PASS2(test_uri_condense_targets,
Modified: subversion/branches/ignore-mergeinfo/subversion/tests/libsvn_subr/eol-test.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/tests/libsvn_subr/eol-test.c?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/tests/libsvn_subr/eol-test.c (original)
+++ subversion/branches/ignore-mergeinfo/subversion/tests/libsvn_subr/eol-test.c Tue Aug 10 17:03:06 2010
@@ -1,10 +1,10 @@
/* eol-test.c --- tests for the eol 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/tests/libsvn_subr/error-test.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/tests/libsvn_subr/error-test.c?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/tests/libsvn_subr/error-test.c (original)
+++ subversion/branches/ignore-mergeinfo/subversion/tests/libsvn_subr/error-test.c Tue Aug 10 17:03:06 2010
@@ -2,10 +2,10 @@
* error-test.c -- test the 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/tests/libsvn_subr/hashdump-test.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/tests/libsvn_subr/hashdump-test.c?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/tests/libsvn_subr/hashdump-test.c (original)
+++ subversion/branches/ignore-mergeinfo/subversion/tests/libsvn_subr/hashdump-test.c Tue Aug 10 17:03:06 2010
@@ -2,10 +2,10 @@
* hashdump-test.c : testing the reading/writing of hashes
*
* ====================================================================
- * 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/tests/libsvn_subr/mergeinfo-test.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/tests/libsvn_subr/mergeinfo-test.c?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/tests/libsvn_subr/mergeinfo-test.c (original)
+++ subversion/branches/ignore-mergeinfo/subversion/tests/libsvn_subr/mergeinfo-test.c Tue Aug 10 17:03:06 2010
@@ -2,10 +2,10 @@
* mergeinfo-test.c -- test the mergeinfo 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
@@ -154,9 +154,12 @@ static const char * const mergeinfo_path
"/trunk",
"/trunk",
"/branch",
- "patch-common::netasq-bpf.c",
- "patch-common_netasq-bpf.c:",
- ":patch:common:netasq:bpf.c",
+
+ /* svn_mergeinfo_parse converts relative merge soure paths to absolute. */
+ "/patch-common::netasq-bpf.c",
+ "/patch-common_netasq-bpf.c:",
+ "/:patch:common:netasq:bpf.c",
+
"/trunk",
"/trunk",
"/trunk",
@@ -1083,6 +1086,22 @@ test_mergeinfo_to_string(apr_pool_t *poo
if (svn_string_compare(expected, output) != TRUE)
return fail(pool, "Mergeinfo string not what we expected");
+ /* Manually construct some mergeinfo with relative path
+ merge source keys. These should be tolerated as input
+ to svn_mergeinfo_to_string(), but the resulting svn_string_t
+ should have absolute keys. */
+ info2 = apr_hash_make(pool);
+ apr_hash_set(info2, "fred",
+ APR_HASH_KEY_STRING,
+ apr_hash_get(info1, "/fred", APR_HASH_KEY_STRING));
+ apr_hash_set(info2, "trunk",
+ APR_HASH_KEY_STRING,
+ apr_hash_get(info1, "/trunk", APR_HASH_KEY_STRING));
+ SVN_ERR(svn_mergeinfo_to_string(&output, info2, pool));
+
+ if (svn_string_compare(expected, output) != TRUE)
+ return fail(pool, "Mergeinfo string not what we expected");
+
return SVN_NO_ERROR;
}
Modified: subversion/branches/ignore-mergeinfo/subversion/tests/libsvn_subr/opt-test.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/tests/libsvn_subr/opt-test.c?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/tests/libsvn_subr/opt-test.c (original)
+++ subversion/branches/ignore-mergeinfo/subversion/tests/libsvn_subr/opt-test.c Tue Aug 10 17:03:06 2010
@@ -2,10 +2,10 @@
* opt-test.c -- test the option 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/tests/libsvn_subr/path-test.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/tests/libsvn_subr/path-test.c?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/tests/libsvn_subr/path-test.c (original)
+++ subversion/branches/ignore-mergeinfo/subversion/tests/libsvn_subr/path-test.c Tue Aug 10 17:03:06 2010
@@ -2,10 +2,10 @@
* path-test.c -- test the path 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/tests/libsvn_subr/revision-test.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/tests/libsvn_subr/revision-test.c?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/tests/libsvn_subr/revision-test.c (original)
+++ subversion/branches/ignore-mergeinfo/subversion/tests/libsvn_subr/revision-test.c Tue Aug 10 17:03:06 2010
@@ -2,10 +2,10 @@
* revision-test.c -- test the revision 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/tests/libsvn_subr/skel-test.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/tests/libsvn_subr/skel-test.c?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/tests/libsvn_subr/skel-test.c (original)
+++ subversion/branches/ignore-mergeinfo/subversion/tests/libsvn_subr/skel-test.c Tue Aug 10 17:03:06 2010
@@ -1,10 +1,10 @@
/* skel-test.c --- tests for the skeleton 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/tests/libsvn_subr/stream-test.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/tests/libsvn_subr/stream-test.c?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/tests/libsvn_subr/stream-test.c (original)
+++ subversion/branches/ignore-mergeinfo/subversion/tests/libsvn_subr/stream-test.c Tue Aug 10 17:03:06 2010
@@ -2,10 +2,10 @@
* stream-test.c -- test the stream 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
@@ -385,7 +385,7 @@ test_stream_line_transformer(apr_pool_t
stream = svn_stream_from_string(string, pool);
svn_stream_set_line_transformer_callback(stream, line_transformer);
-
+
svn_stream_readline(stream, &line, "\n", &eof, pool);
SVN_ERR_ASSERT(strcmp(line->data, inv_lines[0]) == 0);
@@ -426,7 +426,7 @@ test_stream_line_filter_and_transformer(
svn_stream_set_line_filter_callback(stream, line_filter);
svn_stream_set_line_transformer_callback(stream, line_transformer);
-
+
/* Line one should be filtered. */
svn_stream_readline(stream, &line, "\n", &eof, pool);
SVN_ERR_ASSERT(strcmp(line->data, inv_lines[1]) == 0);
@@ -443,7 +443,117 @@ test_stream_line_filter_and_transformer(
}
+static svn_error_t *
+test_stream_tee(apr_pool_t *pool)
+{
+ svn_stringbuf_t *test_bytes = generate_test_bytes(100, pool);
+ svn_stringbuf_t *output_buf1 = svn_stringbuf_create("", pool);
+ svn_stringbuf_t *output_buf2 = svn_stringbuf_create("", pool);
+ svn_stream_t *source_stream = svn_stream_from_stringbuf(test_bytes, pool);
+ svn_stream_t *output_stream1 = svn_stream_from_stringbuf(output_buf1, pool);
+ svn_stream_t *output_stream2 = svn_stream_from_stringbuf(output_buf2, pool);
+ svn_stream_t *tee_stream;
+
+ tee_stream = svn_stream_tee(output_stream1, output_stream2, pool);
+ SVN_ERR(svn_stream_copy3(source_stream, tee_stream, NULL, NULL, pool));
+
+ if (!svn_stringbuf_compare(output_buf1, output_buf2))
+ return svn_error_create(SVN_ERR_TEST_FAILED, NULL,
+ "Duplicated streams did not match.");
+
+ return SVN_NO_ERROR;
+}
+
+static svn_error_t *
+test_stream_seek_file(apr_pool_t *pool)
+{
+ static const char *file_data[2] = {"One", "Two"};
+ svn_stream_t *stream;
+ svn_stringbuf_t *line;
+ svn_boolean_t eof;
+ apr_file_t *f;
+ static const char *fname = "test_stream_seek.txt";
+ int j;
+ apr_status_t status;
+ static const char *NL = APR_EOL_STR;
+ svn_stream_mark_t *mark;
+
+ status = apr_file_open(&f, fname, (APR_READ | APR_WRITE | APR_CREATE |
+ APR_TRUNCATE | APR_DELONCLOSE), APR_OS_DEFAULT, pool);
+ if (status != APR_SUCCESS)
+ return svn_error_createf(SVN_ERR_TEST_FAILED, NULL, "Cannot open '%s'",
+ fname);
+
+ /* Create the file. */
+ for (j = 0; j < 2; j++)
+ {
+ apr_size_t len;
+
+ len = strlen(file_data[j]);
+ status = apr_file_write(f, file_data[j], &len);
+ if (status || len != strlen(file_data[j]))
+ return svn_error_createf(SVN_ERR_TEST_FAILED, NULL,
+ "Cannot write to '%s'", fname);
+ len = strlen(NL);
+ status = apr_file_write(f, NL, &len);
+ if (status || len != strlen(NL))
+ return svn_error_createf(SVN_ERR_TEST_FAILED, NULL,
+ "Cannot write to '%s'", fname);
+ }
+
+ /* Create a stream to read from the file. */
+ stream = svn_stream_from_aprfile2(f, FALSE, pool);
+ SVN_ERR(svn_stream_reset(stream));
+ SVN_ERR(svn_stream_readline(stream, &line, NL, &eof, pool));
+ SVN_ERR_ASSERT(! eof && strcmp(line->data, file_data[0]) == 0);
+ /* Set a mark at the beginning of the second line of the file. */
+ SVN_ERR(svn_stream_mark(stream, &mark, pool));
+ /* Read the second line and then seek back to the mark. */
+ SVN_ERR(svn_stream_readline(stream, &line, NL, &eof, pool));
+ SVN_ERR_ASSERT(! eof && strcmp(line->data, file_data[1]) == 0);
+ SVN_ERR(svn_stream_seek(stream, mark));
+ /* The next read should return the second line again. */
+ SVN_ERR(svn_stream_readline(stream, &line, NL, &eof, pool));
+ SVN_ERR_ASSERT(! eof && strcmp(line->data, file_data[1]) == 0);
+ /* The next read should return EOF. */
+ SVN_ERR(svn_stream_readline(stream, &line, NL, &eof, pool));
+ SVN_ERR_ASSERT(eof);
+
+ SVN_ERR(svn_stream_close(stream));
+
+ return SVN_NO_ERROR;
+}
+
+static svn_error_t *
+test_stream_seek_stringbuf(apr_pool_t *pool)
+{
+ svn_stream_t *stream;
+ svn_stringbuf_t *stringbuf;
+ char buf[4];
+ apr_size_t len;
+ svn_stream_mark_t *mark;
+
+ stringbuf = svn_stringbuf_create("OneTwo", pool);
+ stream = svn_stream_from_stringbuf(stringbuf, pool);
+ len = 3;
+ SVN_ERR(svn_stream_read(stream, buf, &len));
+ buf[3] = '\0';
+ SVN_ERR_ASSERT(strcmp(buf, "One") == 0);
+ SVN_ERR(svn_stream_mark(stream, &mark, pool));
+ len = 3;
+ SVN_ERR(svn_stream_read(stream, buf, &len));
+ buf[3] = '\0';
+ SVN_ERR_ASSERT(strcmp(buf, "Two") == 0);
+ SVN_ERR(svn_stream_seek(stream, mark));
+ len = 3;
+ SVN_ERR(svn_stream_read(stream, buf, &len));
+ buf[3] = '\0';
+ SVN_ERR_ASSERT(strcmp(buf, "Two") == 0);
+ SVN_ERR(svn_stream_close(stream));
+
+ return SVN_NO_ERROR;
+}
/* The test table. */
@@ -463,5 +573,11 @@ struct svn_test_descriptor_t test_funcs[
"test stream line transforming"),
SVN_TEST_PASS2(test_stream_line_filter_and_transformer,
"test stream line filtering and transforming"),
+ SVN_TEST_PASS2(test_stream_tee,
+ "test 'tee' streams"),
+ SVN_TEST_PASS2(test_stream_seek_file,
+ "test stream seeking for files"),
+ SVN_TEST_PASS2(test_stream_seek_stringbuf,
+ "test stream seeking for stringbufs"),
SVN_TEST_NULL
};
Modified: subversion/branches/ignore-mergeinfo/subversion/tests/libsvn_subr/string-test.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/tests/libsvn_subr/string-test.c?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/tests/libsvn_subr/string-test.c (original)
+++ subversion/branches/ignore-mergeinfo/subversion/tests/libsvn_subr/string-test.c Tue Aug 10 17:03:06 2010
@@ -2,10 +2,10 @@
* string-test.c: a collection of libsvn_string tests
*
* ====================================================================
- * 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/tests/libsvn_subr/target-test.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/tests/libsvn_subr/target-test.c?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/tests/libsvn_subr/target-test.c (original)
+++ subversion/branches/ignore-mergeinfo/subversion/tests/libsvn_subr/target-test.c Tue Aug 10 17:03:06 2010
@@ -2,10 +2,10 @@
* target-test.c: test the condense_targets 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/tests/libsvn_subr/time-test.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/tests/libsvn_subr/time-test.c?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/tests/libsvn_subr/time-test.c (original)
+++ subversion/branches/ignore-mergeinfo/subversion/tests/libsvn_subr/time-test.c Tue Aug 10 17:03:06 2010
@@ -2,10 +2,10 @@
* time-test.c -- test the time 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/tests/libsvn_subr/translate-test.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/tests/libsvn_subr/translate-test.c?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/tests/libsvn_subr/translate-test.c (original)
+++ subversion/branches/ignore-mergeinfo/subversion/tests/libsvn_subr/translate-test.c Tue Aug 10 17:03:06 2010
@@ -2,10 +2,10 @@
* translate-test.c -- test the eol and keyword translation subroutine
*
* ====================================================================
- * 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/tests/libsvn_subr/utf-test.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/tests/libsvn_subr/utf-test.c?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/tests/libsvn_subr/utf-test.c (original)
+++ subversion/branches/ignore-mergeinfo/subversion/tests/libsvn_subr/utf-test.c Tue Aug 10 17:03:06 2010
@@ -2,10 +2,10 @@
* utf-test.c -- test the utf 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/tests/libsvn_wc/db-test.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/tests/libsvn_wc/db-test.c?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/tests/libsvn_wc/db-test.c (original)
+++ subversion/branches/ignore-mergeinfo/subversion/tests/libsvn_wc/db-test.c Tue Aug 10 17:03:06 2010
@@ -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
@@ -306,7 +306,8 @@ static const char * const data_loading_s
WC_METADATA_SQL_13,
WC_METADATA_SQL_14,
- WC_METADATA_SQL_15
+ WC_METADATA_SQL_15,
+ WC_METADATA_SQL_16
};
@@ -613,6 +614,32 @@ validate_node(svn_wc__db_t *db,
scratch_pool, scratch_pool));
SVN_TEST_ASSERT(value != NULL && strcmp(value->data, relpath) == 0);
+ SVN_ERR(svn_wc__db_read_props(&props, db, path,
+ scratch_pool, scratch_pool));
+ SVN_TEST_ASSERT(props != NULL);
+ value = apr_hash_get(props, "p1", APR_HASH_KEY_STRING);
+ SVN_TEST_ASSERT(value != NULL && strcmp(value->data, "v1") == 0);
+
+ SVN_ERR(svn_wc__db_read_pristine_props(&props, db, path,
+ scratch_pool, scratch_pool));
+ SVN_TEST_ASSERT(props != NULL);
+ value = apr_hash_get(props, "p1", APR_HASH_KEY_STRING);
+ SVN_TEST_ASSERT(value != NULL && strcmp(value->data, "v1") == 0);
+
+ /* Now add a property value and read it back (all on actual) */
+ apr_hash_set(props, "p999", APR_HASH_KEY_STRING, value);
+
+ SVN_ERR(svn_wc__db_op_set_props(db, path, props, scratch_pool));
+ SVN_ERR(svn_wc__db_read_props(&props, db, path,
+ scratch_pool, scratch_pool));
+ SVN_TEST_ASSERT(props != NULL);
+ value = apr_hash_get(props, "p999", APR_HASH_KEY_STRING);
+ SVN_TEST_ASSERT(value != NULL && strcmp(value->data, "v1") == 0);
+
+ if (status == svn_wc__db_status_normal)
+ SVN_ERR(svn_wc__db_temp_op_set_pristine_props(db, path, props, FALSE,
+ scratch_pool));
+
return SVN_NO_ERROR;
}
@@ -876,7 +903,7 @@ test_pdh(apr_pool_t *pool)
"sub/A/B/C/D", ROOT_ONE, UUID_ONE, 1,
svn_wc__db_kind_file, svn_wc__db_status_absent,
pool));
-
+
return SVN_NO_ERROR;
}
@@ -1208,7 +1235,7 @@ test_global_relocate(apr_pool_t *pool)
const char *repos_relpath;
const char *repos_root_url;
const char *repos_uuid;
-
+
SVN_ERR(create_open(&db, &local_abspath,
"test_global_relocate", SVN_WC__VERSION,
svn_wc__db_openmode_readonly, pool));
Modified: subversion/branches/ignore-mergeinfo/subversion/tests/libsvn_wc/tree-conflict-data-test.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/tests/libsvn_wc/tree-conflict-data-test.c?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/tests/libsvn_wc/tree-conflict-data-test.c (original)
+++ subversion/branches/ignore-mergeinfo/subversion/tests/libsvn_wc/tree-conflict-data-test.c Tue Aug 10 17:03:06 2010
@@ -1,4 +1,25 @@
/*
+ *
+ * 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.
+ *
+ */
+
+/*
* tree-conflict-data-test.c -- test the storage of tree conflict data
*/
Modified: subversion/branches/ignore-mergeinfo/subversion/tests/svn_test.h
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/tests/svn_test.h?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/tests/svn_test.h (original)
+++ subversion/branches/ignore-mergeinfo/subversion/tests/svn_test.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/tests/svn_test_fs.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/tests/svn_test_fs.c?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/tests/svn_test_fs.c (original)
+++ subversion/branches/ignore-mergeinfo/subversion/tests/svn_test_fs.c Tue Aug 10 17:03:06 2010
@@ -1,10 +1,10 @@
/* fs-helpers.c --- tests for the filesystem
*
* ====================================================================
- * 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/tests/svn_test_fs.h
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/tests/svn_test_fs.h?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/tests/svn_test_fs.h (original)
+++ subversion/branches/ignore-mergeinfo/subversion/tests/svn_test_fs.h Tue Aug 10 17:03:06 2010
@@ -1,10 +1,10 @@
/* fs-helpers.c --- tests for the filesystem
*
* ====================================================================
- * 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/tests/svn_test_main.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/tests/svn_test_main.c?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/tests/svn_test_main.c (original)
+++ subversion/branches/ignore-mergeinfo/subversion/tests/svn_test_main.c Tue Aug 10 17:03:06 2010
@@ -2,10 +2,10 @@
* tests-main.c: shared main() & friends for SVN test-suite programs
*
* ====================================================================
- * 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/tools/backup/hot-backup.py.in
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/tools/backup/hot-backup.py.in?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/tools/backup/hot-backup.py.in (original)
+++ subversion/branches/ignore-mergeinfo/tools/backup/hot-backup.py.in Tue Aug 10 17:03:06 2010
@@ -10,10 +10,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/ignore-mergeinfo/tools/bdb/erase-all-text-data.py
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/tools/bdb/erase-all-text-data.py?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/tools/bdb/erase-all-text-data.py (original)
+++ subversion/branches/ignore-mergeinfo/tools/bdb/erase-all-text-data.py Tue Aug 10 17:03:06 2010
@@ -1,5 +1,25 @@
#!/usr/bin/env python
#
+#
+# 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.
+#
+#
+#
# Erases the text of every file in a BDB repository
#
Modified: subversion/branches/ignore-mergeinfo/tools/bdb/skel.py
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/tools/bdb/skel.py?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/tools/bdb/skel.py (original)
+++ subversion/branches/ignore-mergeinfo/tools/bdb/skel.py Tue Aug 10 17:03:06 2010
@@ -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.
+#
+#
# Python parser for Subversion skels
import string, re
Modified: subversion/branches/ignore-mergeinfo/tools/bdb/svn-bdb-view.py
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/tools/bdb/svn-bdb-view.py?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/tools/bdb/svn-bdb-view.py (original)
+++ subversion/branches/ignore-mergeinfo/tools/bdb/svn-bdb-view.py Tue Aug 10 17:03:06 2010
@@ -1,5 +1,25 @@
#!/usr/bin/env python
#
+#
+# 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.
+#
+#
+#
# This is a pretty-printer for subversion BDB repository databases.
#
Modified: subversion/branches/ignore-mergeinfo/tools/bdb/svnfs.py
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/tools/bdb/svnfs.py?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/tools/bdb/svnfs.py (original)
+++ subversion/branches/ignore-mergeinfo/tools/bdb/svnfs.py Tue Aug 10 17:03:06 2010
@@ -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.
+#
+#
# A handle object for convenience in opening a svn repository
import sys
Modified: subversion/branches/ignore-mergeinfo/tools/bdb/whatis-rep.py
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/tools/bdb/whatis-rep.py?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/tools/bdb/whatis-rep.py (original)
+++ subversion/branches/ignore-mergeinfo/tools/bdb/whatis-rep.py Tue Aug 10 17:03:06 2010
@@ -1,5 +1,25 @@
#!/usr/bin/env python
#
+#
+# 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.
+#
+#
+#
# Print a description (including data, path, and revision) of the
# specified node reps in a Subversion filesystem. Walks as much of
# the reps table as necessary to locate the data (e.g. does a table
Modified: subversion/branches/ignore-mergeinfo/tools/buildbot/slaves/i686-debian-sarge1/mount-ramdrive.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/tools/buildbot/slaves/i686-debian-sarge1/mount-ramdrive.c?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/tools/buildbot/slaves/i686-debian-sarge1/mount-ramdrive.c (original)
+++ subversion/branches/ignore-mergeinfo/tools/buildbot/slaves/i686-debian-sarge1/mount-ramdrive.c Tue Aug 10 17:03:06 2010
@@ -1,3 +1,24 @@
+/*
+ *
+ * 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.
+ *
+ */
+
#include <stdio.h>
#include <unistd.h>
Modified: subversion/branches/ignore-mergeinfo/tools/buildbot/slaves/i686-debian-sarge1/svnbuild.sh
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/tools/buildbot/slaves/i686-debian-sarge1/svnbuild.sh?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/tools/buildbot/slaves/i686-debian-sarge1/svnbuild.sh (original)
+++ subversion/branches/ignore-mergeinfo/tools/buildbot/slaves/i686-debian-sarge1/svnbuild.sh Tue Aug 10 17:03:06 2010
@@ -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.
+#
+#
set -x
Modified: subversion/branches/ignore-mergeinfo/tools/buildbot/slaves/i686-debian-sarge1/svncheck.sh
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/tools/buildbot/slaves/i686-debian-sarge1/svncheck.sh?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/tools/buildbot/slaves/i686-debian-sarge1/svncheck.sh (original)
+++ subversion/branches/ignore-mergeinfo/tools/buildbot/slaves/i686-debian-sarge1/svncheck.sh Tue Aug 10 17:03:06 2010
@@ -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.
+#
+#
set -x
Modified: subversion/branches/ignore-mergeinfo/tools/buildbot/slaves/i686-debian-sarge1/svnclean.sh
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/tools/buildbot/slaves/i686-debian-sarge1/svnclean.sh?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/tools/buildbot/slaves/i686-debian-sarge1/svnclean.sh (original)
+++ subversion/branches/ignore-mergeinfo/tools/buildbot/slaves/i686-debian-sarge1/svnclean.sh Tue Aug 10 17:03:06 2010
@@ -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.
+#
+#
set -x
Modified: subversion/branches/ignore-mergeinfo/tools/buildbot/slaves/i686-debian-sarge1/svnlog.sh
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/tools/buildbot/slaves/i686-debian-sarge1/svnlog.sh?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/tools/buildbot/slaves/i686-debian-sarge1/svnlog.sh (original)
+++ subversion/branches/ignore-mergeinfo/tools/buildbot/slaves/i686-debian-sarge1/svnlog.sh Tue Aug 10 17:03:06 2010
@@ -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.
+#
+#
set -x
Modified: subversion/branches/ignore-mergeinfo/tools/buildbot/slaves/i686-debian-sarge1/unmount-ramdrive.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/tools/buildbot/slaves/i686-debian-sarge1/unmount-ramdrive.c?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/tools/buildbot/slaves/i686-debian-sarge1/unmount-ramdrive.c (original)
+++ subversion/branches/ignore-mergeinfo/tools/buildbot/slaves/i686-debian-sarge1/unmount-ramdrive.c Tue Aug 10 17:03:06 2010
@@ -1,3 +1,24 @@
+/*
+ *
+ * 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.
+ *
+ */
+
#include <stdio.h>
#include <unistd.h>
Modified: subversion/branches/ignore-mergeinfo/tools/buildbot/slaves/osx10.4-gcc4.0.1-ia32/svnbuild.sh
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/tools/buildbot/slaves/osx10.4-gcc4.0.1-ia32/svnbuild.sh?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/tools/buildbot/slaves/osx10.4-gcc4.0.1-ia32/svnbuild.sh (original)
+++ subversion/branches/ignore-mergeinfo/tools/buildbot/slaves/osx10.4-gcc4.0.1-ia32/svnbuild.sh Tue Aug 10 17:03:06 2010
@@ -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.
+#
+#
echo "========= getting apr 0.9.x"
cp -r ../apr .
Modified: subversion/branches/ignore-mergeinfo/tools/buildbot/slaves/osx10.4-gcc4.0.1-ia32/svncheck.sh
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/tools/buildbot/slaves/osx10.4-gcc4.0.1-ia32/svncheck.sh?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/tools/buildbot/slaves/osx10.4-gcc4.0.1-ia32/svncheck.sh (original)
+++ subversion/branches/ignore-mergeinfo/tools/buildbot/slaves/osx10.4-gcc4.0.1-ia32/svncheck.sh Tue Aug 10 17:03:06 2010
@@ -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.
+#
+#
set -x
Modified: subversion/branches/ignore-mergeinfo/tools/buildbot/slaves/osx10.4-gcc4.0.1-ia32/svnclean.sh
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/tools/buildbot/slaves/osx10.4-gcc4.0.1-ia32/svnclean.sh?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/tools/buildbot/slaves/osx10.4-gcc4.0.1-ia32/svnclean.sh (original)
+++ subversion/branches/ignore-mergeinfo/tools/buildbot/slaves/osx10.4-gcc4.0.1-ia32/svnclean.sh Tue Aug 10 17:03:06 2010
@@ -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.
+#
+#
# ../unmount_ramd.sh
Modified: subversion/branches/ignore-mergeinfo/tools/buildbot/slaves/osx10.4-gcc4.0.1-ia32/svnlog.sh
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/tools/buildbot/slaves/osx10.4-gcc4.0.1-ia32/svnlog.sh?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/tools/buildbot/slaves/osx10.4-gcc4.0.1-ia32/svnlog.sh (original)
+++ subversion/branches/ignore-mergeinfo/tools/buildbot/slaves/osx10.4-gcc4.0.1-ia32/svnlog.sh Tue Aug 10 17:03:06 2010
@@ -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.
+#
+#
# upload file to server
FILENAME=tests-`date +%Y%m%d%H%M`.log.tgz
Modified: subversion/branches/ignore-mergeinfo/tools/buildbot/slaves/ubuntu-x64/mount-ramdrive.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/tools/buildbot/slaves/ubuntu-x64/mount-ramdrive.c?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/tools/buildbot/slaves/ubuntu-x64/mount-ramdrive.c (original)
+++ subversion/branches/ignore-mergeinfo/tools/buildbot/slaves/ubuntu-x64/mount-ramdrive.c Tue Aug 10 17:03:06 2010
@@ -1,3 +1,24 @@
+/*
+ *
+ * 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.
+ *
+ */
+
#include <stdio.h>
#include <unistd.h>
Modified: subversion/branches/ignore-mergeinfo/tools/buildbot/slaves/ubuntu-x64/svnbuild.sh
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/tools/buildbot/slaves/ubuntu-x64/svnbuild.sh?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/tools/buildbot/slaves/ubuntu-x64/svnbuild.sh (original)
+++ subversion/branches/ignore-mergeinfo/tools/buildbot/slaves/ubuntu-x64/svnbuild.sh Tue Aug 10 17:03:06 2010
@@ -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.
+#
+#
set -x
@@ -9,14 +29,9 @@ echo "========= autogen.sh"
echo "========= configure"
./configure --enable-javahl --enable-maintainer-mode \
- --with-neon=/usr/local \
- --with-apxs=/home/hwright/dev/svn-buildbot/usr/bin/apxs \
--without-berkeley-db \
- --with-apr=/usr/local/apr \
- --with-jdk=/usr/lib/jvm/java-6-sun-1.6.0.10 \
- --with-junit=/usr/share/java/junit.jar \
- --with-apr-util=/usr/local/apr \
- --with-sqlite=/usr/local || exit $?
+ --with-jdk=/usr/lib/jvm/java-6-sun-1.6.0.16 \
+ --with-junit=/usr/share/java/junit.jar || exit $?
echo "========= make"
make || exit $?
Modified: subversion/branches/ignore-mergeinfo/tools/buildbot/slaves/ubuntu-x64/svncheck-bindings.sh
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/tools/buildbot/slaves/ubuntu-x64/svncheck-bindings.sh?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/tools/buildbot/slaves/ubuntu-x64/svncheck-bindings.sh (original)
+++ subversion/branches/ignore-mergeinfo/tools/buildbot/slaves/ubuntu-x64/svncheck-bindings.sh Tue Aug 10 17:03:06 2010
@@ -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.
+#
+#
set -x
Modified: subversion/branches/ignore-mergeinfo/tools/buildbot/slaves/ubuntu-x64/svncheck.sh
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/tools/buildbot/slaves/ubuntu-x64/svncheck.sh?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/tools/buildbot/slaves/ubuntu-x64/svncheck.sh (original)
+++ subversion/branches/ignore-mergeinfo/tools/buildbot/slaves/ubuntu-x64/svncheck.sh Tue Aug 10 17:03:06 2010
@@ -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.
+#
+#
set -x
Modified: subversion/branches/ignore-mergeinfo/tools/buildbot/slaves/ubuntu-x64/svnclean.sh
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/tools/buildbot/slaves/ubuntu-x64/svnclean.sh?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/tools/buildbot/slaves/ubuntu-x64/svnclean.sh (original)
+++ subversion/branches/ignore-mergeinfo/tools/buildbot/slaves/ubuntu-x64/svnclean.sh Tue Aug 10 17:03:06 2010
@@ -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.
+#
+#
set -x
Modified: subversion/branches/ignore-mergeinfo/tools/buildbot/slaves/ubuntu-x64/svnlog.sh
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/tools/buildbot/slaves/ubuntu-x64/svnlog.sh?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/tools/buildbot/slaves/ubuntu-x64/svnlog.sh (original)
+++ subversion/branches/ignore-mergeinfo/tools/buildbot/slaves/ubuntu-x64/svnlog.sh Tue Aug 10 17:03:06 2010
@@ -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.
+#
+#
set -x
Modified: subversion/branches/ignore-mergeinfo/tools/buildbot/slaves/ubuntu-x64/unmount-ramdrive.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/tools/buildbot/slaves/ubuntu-x64/unmount-ramdrive.c?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/tools/buildbot/slaves/ubuntu-x64/unmount-ramdrive.c (original)
+++ subversion/branches/ignore-mergeinfo/tools/buildbot/slaves/ubuntu-x64/unmount-ramdrive.c Tue Aug 10 17:03:06 2010
@@ -1,3 +1,24 @@
+/*
+ *
+ * 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.
+ *
+ */
+
#include <stdio.h>
#include <unistd.h>
Modified: subversion/branches/ignore-mergeinfo/tools/buildbot/slaves/win32-xp-VS2005/config.bat
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/tools/buildbot/slaves/win32-xp-VS2005/config.bat?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/tools/buildbot/slaves/win32-xp-VS2005/config.bat (original)
+++ subversion/branches/ignore-mergeinfo/tools/buildbot/slaves/win32-xp-VS2005/config.bat Tue Aug 10 17:03:06 2010
@@ -1,3 +1,20 @@
+REM Licensed to the Apache Software Foundation (ASF) under one
+REM or more contributor license agreements. See the NOTICE file
+REM distributed with this work for additional information
+REM regarding copyright ownership. The ASF licenses this file
+REM to you under the Apache License, Version 2.0 (the
+REM "License"); you may not use this file except in compliance
+REM with the License. You may obtain a copy of the License at
+REM
+REM http://www.apache.org/licenses/LICENSE-2.0
+REM
+REM Unless required by applicable law or agreed to in writing,
+REM software distributed under the License is distributed on an
+REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+REM KIND, either express or implied. See the License for the
+REM specific language governing permissions and limitations
+REM under the License.
+
@echo off
set HTTPD_BIN_DIR=C:\Apache2
set GETTEXT_DIR=C:\svn-builder\djh-xp-vse2005\gettext