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 2011/08/17 16:01:10 UTC
svn commit: r1158717 - in /subversion/branches/1.7.x: ./ STATUS
subversion/libsvn_client/commit.c subversion/tests/cmdline/import_tests.py
Author: hwright
Date: Wed Aug 17 14:01:10 2011
New Revision: 1158717
URL: http://svn.apache.org/viewvc?rev=1158717&view=rev
Log:
Merge r1155391, r1155404, r1156218 from trunk:
* r1155391, r1155404, r1156218
Fix issue 3983, import into foreign repository.
Justification:
It's a regression from 1.6.
Votes:
+1: philip, rhuijben, cmpilato
Modified:
subversion/branches/1.7.x/ (props changed)
subversion/branches/1.7.x/STATUS
subversion/branches/1.7.x/subversion/libsvn_client/commit.c
subversion/branches/1.7.x/subversion/tests/cmdline/import_tests.py
Propchange: subversion/branches/1.7.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Aug 17 14:01:10 2011
@@ -56,4 +56,4 @@
/subversion/branches/tree-conflicts:868291-873154
/subversion/branches/tree-conflicts-notify:873926-874008
/subversion/branches/uris-as-urls:1060426-1064427
-/subversion/trunk:1146013,1146121,1146219,1146222,1146274,1146492,1146555,1146606,1146620,1146684,1146781,1146832,1146834,1146870,1146899,1146904,1147293,1147309,1147882,1148071,1148131,1148374,1148424,1148566,1148588,1148853,1148877,1148882,1148936,1149105,1149141,1149160,1149228,1149240,1149343,1149371-1149372,1149377,1149398,1149401,1149539,1149572,1149627,1149675,1149701,1149713,1150242,1150254,1150260-1150261,1150266,1150302,1150327,1150368,1150372,1150441,1150506,1150812,1150853,1151036,1151177,1151610,1151906,1151911,1152129,1152140,1152189-1152190,1152282,1152726,1153138,1153141,1153416,1153799,1153807,1153968,1154009,1154023,1154121,1154165,1154273,1154461,1154717-1154718,1154733,1154908,1154982,1155015,1155044,1155124,1155131,1155313,1155334,1156085,1156098,1156216,1156312,1156527,1156717,1156721,1156750,1156827,1156838,1157416,1158193-1158194,1158285,1158288,1158303,1158421,1158436,1158455
+/subversion/trunk:1146013,1146121,1146219,1146222,1146274,1146492,1146555,1146606,1146620,1146684,1146781,1146832,1146834,1146870,1146899,1146904,1147293,1147309,1147882,1148071,1148131,1148374,1148424,1148566,1148588,1148853,1148877,1148882,1148936,1149105,1149141,1149160,1149228,1149240,1149343,1149371-1149372,1149377,1149398,1149401,1149539,1149572,1149627,1149675,1149701,1149713,1150242,1150254,1150260-1150261,1150266,1150302,1150327,1150368,1150372,1150441,1150506,1150812,1150853,1151036,1151177,1151610,1151906,1151911,1152129,1152140,1152189-1152190,1152282,1152726,1153138,1153141,1153416,1153799,1153807,1153968,1154009,1154023,1154121,1154165,1154273,1154461,1154717-1154718,1154733,1154908,1154982,1155015,1155044,1155124,1155131,1155313,1155334,1155391,1155404,1156085,1156098,1156216,1156218,1156312,1156527,1156717,1156721,1156750,1156827,1156838,1157416,1158193-1158194,1158285,1158288,1158303,1158421,1158436,1158455
Modified: subversion/branches/1.7.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1158717&r1=1158716&r2=1158717&view=diff
==============================================================================
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Wed Aug 17 14:01:10 2011
@@ -141,13 +141,6 @@ Veto-blocked changes:
Approved changes:
=================
- * r1155391, r1155404, r1156218
- Fix issue 3983, import into foreign repository.
- Justification:
- It's a regression from 1.6.
- Votes:
- +1: philip, rhuijben, cmpilato
-
* r1158209, r1158210, r1158217
Fix another variant of issues #2557 and #3987: 'svnversion symlink/to/wc'.
Justification:
Modified: subversion/branches/1.7.x/subversion/libsvn_client/commit.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/libsvn_client/commit.c?rev=1158717&r1=1158716&r2=1158717&view=diff
==============================================================================
--- subversion/branches/1.7.x/subversion/libsvn_client/commit.c (original)
+++ subversion/branches/1.7.x/subversion/libsvn_client/commit.c Wed Aug 17 14:01:10 2011
@@ -696,7 +696,6 @@ svn_client_import4(const char *path,
apr_hash_t *excludes = apr_hash_make(pool);
svn_node_kind_t kind;
const char *local_abspath;
- const char *base_dir_abspath;
apr_array_header_t *new_entries = apr_array_make(pool, 4,
sizeof(const char *));
const char *temp;
@@ -708,7 +707,6 @@ svn_client_import4(const char *path,
_("'%s' is not a local path"), path);
SVN_ERR(svn_dirent_get_absolute(&local_abspath, path, pool));
- base_dir_abspath = local_abspath;
/* Create a new commit item and add it to the array. */
if (SVN_CLIENT__HAS_LOG_MSG_FUNC(ctx))
@@ -739,8 +737,6 @@ svn_client_import4(const char *path,
}
SVN_ERR(svn_io_check_path(local_abspath, &kind, pool));
- if (kind == svn_node_file)
- base_dir_abspath = svn_dirent_dirname(local_abspath, pool);
/* Figure out all the path components we need to create just to have
a place to stick our imported tree. */
@@ -770,7 +766,7 @@ svn_client_import4(const char *path,
}
}
while ((err = get_ra_editor(&ra_session,
- &editor, &edit_baton, ctx, url, base_dir_abspath,
+ &editor, &edit_baton, ctx, url, NULL,
log_msg, NULL, revprop_table, FALSE, NULL, TRUE,
commit_callback, commit_baton, subpool)));
Modified: subversion/branches/1.7.x/subversion/tests/cmdline/import_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/tests/cmdline/import_tests.py?rev=1158717&r1=1158716&r2=1158717&view=diff
==============================================================================
--- subversion/branches/1.7.x/subversion/tests/cmdline/import_tests.py (original)
+++ subversion/branches/1.7.x/subversion/tests/cmdline/import_tests.py Wed Aug 17 14:01:10 2011
@@ -370,6 +370,21 @@ enable-auto-props = yes
'--config-dir', config_dir)
#----------------------------------------------------------------------
+@Issue(3983)
+def import_into_foreign_repo(sbox):
+ "import into a foreign repo"
+
+ sbox.build(read_only=True)
+
+ other_repo_dir, other_repo_url = sbox.add_repo_path('other')
+ svntest.main.safe_rmtree(other_repo_dir, 1)
+ svntest.main.create_repos(other_repo_dir)
+
+ svntest.actions.run_and_verify_svn(None, None, [], 'import',
+ '-m', 'Log message for new import',
+ sbox.ospath('A/mu'), other_repo_url + '/f')
+
+#----------------------------------------------------------------------
########################################################################
# Run the tests
@@ -381,6 +396,7 @@ test_list = [ None,
import_avoid_empty_revision,
import_no_ignores,
import_eol_style,
+ import_into_foreign_repo,
]
if __name__ == '__main__':