[prev in list] [next in list] [prev in thread] [next in thread] 

List:       subversion-issues
Subject:    [Issue 3823]  'update' update file external without commit is
From:       cmpilato () tigris ! org
Date:       2011-03-31 15:46:37
Message-ID: 20110331154637.DD2EC540065 () sc157-tigr ! sjc ! collab ! net
[Download RAW message or body]

http://subversion.tigris.org/issues/show_bug.cgi?id=3823






------- Additional comments from cmpilato@tigris.org Thu Mar 31 08:46:37 -0700 2011 -------
With this patch the codes survives a bit longer (because this function is
tolerant of added-but-not-committed nodes).  But
svn_wc__set_file_external_location() is still not tolerant enough.

Index: subversion/libsvn_wc/adm_ops.c
===================================================================
--- subversion/libsvn_wc/adm_ops.c	(revision 1087321)
+++ subversion/libsvn_wc/adm_ops.c	(working copy)
@@ -1199,15 +1199,13 @@
                                const svn_opt_revision_t *external_rev,
                                apr_pool_t *scratch_pool)
 {
-  svn_wc__db_t *db = wc_ctx->db;
   const char *parent_abspath, *base_name, *repos_root_url;
 
   svn_dirent_split(&parent_abspath, &base_name, local_abspath, scratch_pool);
 
-  SVN_ERR(svn_wc__db_scan_base_repos(NULL, &repos_root_url, NULL, db,
-                                     parent_abspath, scratch_pool,
-                                     scratch_pool));
-
+  SVN_ERR(svn_wc__node_get_repos_info(&repos_root_url, NULL, wc_ctx,
+                                      parent_abspath, TRUE, FALSE,
+                                      scratch_pool, scratch_pool));
   SVN_ERR(svn_wc__set_file_external_location(wc_ctx, local_abspath,
                                              external_url, external_peg_rev,
                                              external_rev, repos_root_url,

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=463&dsMessageId=2715664

To unsubscribe from this discussion, e-mail: [issues-unsubscribe@subversion.tigris.org].
[prev in list] [next in list] [prev in thread] [next in thread]