| 1 |
arfrever 09/03/28 19:37:57 |
| 2 |
|
| 3 |
Modified: subversion-1.6.0-various_fixes.patch |
| 4 |
Log: |
| 5 |
Fix undefined references to svn_fs_path_change2_create() (bug #263714). |
| 6 |
Fix dependencies (bug #263772). Fix segmentation fault when updating old |
| 7 |
working copies which don't have UUID recorded. |
| 8 |
(Portage version: 13240-svn/cvs/Linux x86_64) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.2 dev-util/subversion/files/subversion-1.6.0-various_fixes.patch |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/subversion/files/subversion-1.6.0-various_fixes.patch?rev=1.2&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/subversion/files/subversion-1.6.0-various_fixes.patch?rev=1.2&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/subversion/files/subversion-1.6.0-various_fixes.patch?r1=1.1&r2=1.2 |
| 16 |
|
| 17 |
Index: subversion-1.6.0-various_fixes.patch |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/dev-util/subversion/files/subversion-1.6.0-various_fixes.patch,v |
| 20 |
retrieving revision 1.1 |
| 21 |
retrieving revision 1.2 |
| 22 |
diff -u -r1.1 -r1.2 |
| 23 |
--- subversion-1.6.0-various_fixes.patch 22 Mar 2009 02:07:58 -0000 1.1 |
| 24 |
+++ subversion-1.6.0-various_fixes.patch 28 Mar 2009 19:37:57 -0000 1.2 |
| 25 |
@@ -2,7 +2,58 @@ |
| 26 |
https://svn.collab.net/viewvc/svn?view=revision&revision=36253 |
| 27 |
https://svn.collab.net/viewvc/svn?view=revision&revision=36302 |
| 28 |
https://svn.collab.net/viewvc/svn?view=revision&revision=36686 |
| 29 |
+https://svn.collab.net/viewvc/svn?view=revision&revision=36751 |
| 30 |
+https://svn.collab.net/viewvc/svn?view=revision&revision=36823 |
| 31 |
|
| 32 |
+--- build.conf |
| 33 |
++++ build.conf |
| 34 |
+@@ -3,7 +3,7 @@ |
| 35 |
+ # |
| 36 |
+ ###################################################################### |
| 37 |
+ # |
| 38 |
+-# Copyright (c) 2000-2008 CollabNet. All rights reserved. |
| 39 |
++# Copyright (c) 2000-2009 CollabNet. All rights reserved. |
| 40 |
+ # |
| 41 |
+ # This software is licensed as described in the file COPYING, which |
| 42 |
+ # you should have received as part of this distribution. The terms |
| 43 |
+@@ -256,7 +256,7 @@ |
| 44 |
+ type = lib |
| 45 |
+ path = subversion/libsvn_fs |
| 46 |
+ install = ramod-lib |
| 47 |
+-libs = libsvn_subr fs-libs apr |
| 48 |
++libs = libsvn_fs_util libsvn_subr fs-libs apr |
| 49 |
+ # conditionally add more dependencies |
| 50 |
+ add-deps = $(SVN_FS_LIB_DEPS) |
| 51 |
+ add-install-deps = $(SVN_FS_LIB_INSTALL_DEPS) |
| 52 |
+--- subversion/include/private/svn_fs_util.h |
| 53 |
++++ subversion/include/private/svn_fs_util.h |
| 54 |
+@@ -3,7 +3,7 @@ |
| 55 |
+ * consumed by only fs_* libs. |
| 56 |
+ * |
| 57 |
+ * ==================================================================== |
| 58 |
+- * Copyright (c) 2007 CollabNet. All rights reserved. |
| 59 |
++ * Copyright (c) 2007, 2009 CollabNet. All rights reserved. |
| 60 |
+ * |
| 61 |
+ * This software is licensed as described in the file COPYING, which |
| 62 |
+ * you should have received as part of this distribution. The terms |
| 63 |
+@@ -169,6 +169,17 @@ |
| 64 |
+ const char *path, |
| 65 |
+ apr_pool_t *pool); |
| 66 |
+ |
| 67 |
++/* Allocate an svn_fs_path_change2_t structure in POOL, initialize and |
| 68 |
++ return it. |
| 69 |
++ |
| 70 |
++ Set the node_rev_id field of the created struct to NODE_REV_ID, and |
| 71 |
++ change_kind to CHANGE_KIND. Set all other fields to their _unknown, |
| 72 |
++ NULL or invalid value, respectively. */ |
| 73 |
++svn_fs_path_change2_t * |
| 74 |
++svn_fs__path_change2_create(const svn_fs_id_t *node_rev_id, |
| 75 |
++ svn_fs_path_change_kind_t change_kind, |
| 76 |
++ apr_pool_t *pool); |
| 77 |
++ |
| 78 |
+ #ifdef __cplusplus |
| 79 |
+ } |
| 80 |
+ #endif /* __cplusplus */ |
| 81 |
--- subversion/libsvn_client/merge.c |
| 82 |
+++ subversion/libsvn_client/merge.c |
| 83 |
@@ -7948,7 +7948,7 @@ |
| 84 |
@@ -14,6 +65,63 @@ |
| 85 |
svn_error_t *err; |
| 86 |
svn_boolean_t same_repos; |
| 87 |
|
| 88 |
+--- subversion/libsvn_fs/fs-loader.c |
| 89 |
++++ subversion/libsvn_fs/fs-loader.c |
| 90 |
+@@ -2,7 +2,7 @@ |
| 91 |
+ * fs_loader.c: Front-end to the various FS back ends |
| 92 |
+ * |
| 93 |
+ * ==================================================================== |
| 94 |
+- * Copyright (c) 2000-2008 CollabNet. All rights reserved. |
| 95 |
++ * Copyright (c) 2000-2009 CollabNet. All rights reserved. |
| 96 |
+ * |
| 97 |
+ * This software is licensed as described in the file COPYING, which |
| 98 |
+ * you should have received as part of this distribution. The terms |
| 99 |
+@@ -34,6 +34,7 @@ |
| 100 |
+ #include "svn_string.h" |
| 101 |
+ #include "svn_private_config.h" |
| 102 |
+ |
| 103 |
++#include "private/svn_fs_util.h" |
| 104 |
+ #include "private/svn_utf_private.h" |
| 105 |
+ |
| 106 |
+ #include "fs-loader.h" |
| 107 |
+@@ -1320,6 +1321,13 @@ |
| 108 |
+ return SVN_NO_ERROR; |
| 109 |
+ } |
| 110 |
+ |
| 111 |
++svn_fs_path_change2_t * |
| 112 |
++svn_fs_path_change2_create(const svn_fs_id_t *node_rev_id, |
| 113 |
++ svn_fs_path_change_kind_t change_kind, |
| 114 |
++ apr_pool_t *pool) |
| 115 |
++{ |
| 116 |
++ return svn_fs__path_change2_create(node_rev_id, change_kind, pool); |
| 117 |
++} |
| 118 |
+ |
| 119 |
+ /* Return the library version number. */ |
| 120 |
+ const svn_version_t * |
| 121 |
+--- subversion/libsvn_fs_util/fs-util.c |
| 122 |
++++ subversion/libsvn_fs_util/fs-util.c |
| 123 |
+@@ -2,7 +2,7 @@ |
| 124 |
+ * ends. |
| 125 |
+ * |
| 126 |
+ * ==================================================================== |
| 127 |
+- * Copyright (c) 2007 CollabNet. All rights reserved. |
| 128 |
++ * Copyright (c) 2007, 2009 CollabNet. All rights reserved. |
| 129 |
+ * |
| 130 |
+ * This software is licensed as described in the file COPYING, which |
| 131 |
+ * you should have received as part of this distribution. The terms |
| 132 |
+@@ -131,9 +131,9 @@ |
| 133 |
+ } |
| 134 |
+ |
| 135 |
+ svn_fs_path_change2_t * |
| 136 |
+-svn_fs_path_change2_create(const svn_fs_id_t *node_rev_id, |
| 137 |
+- svn_fs_path_change_kind_t change_kind, |
| 138 |
+- apr_pool_t *pool) |
| 139 |
++svn_fs__path_change2_create(const svn_fs_id_t *node_rev_id, |
| 140 |
++ svn_fs_path_change_kind_t change_kind, |
| 141 |
++ apr_pool_t *pool) |
| 142 |
+ { |
| 143 |
+ svn_fs_path_change2_t *change; |
| 144 |
+ |
| 145 |
--- subversion/libsvn_wc/crop.c |
| 146 |
+++ subversion/libsvn_wc/crop.c |
| 147 |
@@ -284,8 +284,9 @@ |
| 148 |
@@ -61,3 +169,27 @@ |
| 149 |
} |
| 150 |
else if (err) |
| 151 |
return err; |
| 152 |
+--- subversion/libsvn_wc/update_editor.c |
| 153 |
++++ subversion/libsvn_wc/update_editor.c |
| 154 |
+@@ -2313,12 +2313,15 @@ |
| 155 |
+ |
| 156 |
+ A dir added with history is a tree conflict. */ |
| 157 |
+ |
| 158 |
+- if (strcmp(entry->uuid, parent_entry->uuid) != 0) |
| 159 |
+- return svn_error_createf |
| 160 |
+- (SVN_ERR_WC_OBSTRUCTED_UPDATE, NULL, |
| 161 |
+- _("UUID mismatch: existing directory '%s' was checked out " |
| 162 |
+- "from a different repository"), |
| 163 |
+- svn_path_local_style(db->path, pool)); |
| 164 |
++ if (entry->uuid && parent_entry->uuid) |
| 165 |
++ { |
| 166 |
++ if (strcmp(entry->uuid, parent_entry->uuid) != 0) |
| 167 |
++ return svn_error_createf( |
| 168 |
++ SVN_ERR_WC_OBSTRUCTED_UPDATE, NULL, |
| 169 |
++ _("UUID mismatch: existing directory '%s' was checked out " |
| 170 |
++ "from a different repository"), |
| 171 |
++ svn_path_local_style(db->path, pool)); |
| 172 |
++ } |
| 173 |
+ |
| 174 |
+ if (!eb->switch_url |
| 175 |
+ && strcmp(db->new_URL, entry->url) != 0) |
Archives