You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by gs...@apache.org on 2013/07/11 06:06:09 UTC
svn commit: r1502106 [2/5] - in /subversion/branches/1.8.x-busted-proxy: ./
build/ac-macros/ build/generator/ subversion/bindings/javahl/native/
subversion/bindings/swig/perl/libsvn_swig_perl/
subversion/bindings/swig/perl/native/ subversion/libsvn_cli...
Modified: subversion/branches/1.8.x-busted-proxy/subversion/libsvn_ra_svn/protocol
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x-busted-proxy/subversion/libsvn_ra_svn/protocol?rev=1502106&r1=1502105&r2=1502106&view=diff
==============================================================================
--- subversion/branches/1.8.x-busted-proxy/subversion/libsvn_ra_svn/protocol (original)
+++ subversion/branches/1.8.x-busted-proxy/subversion/libsvn_ra_svn/protocol Thu Jul 11 04:06:08 2013
@@ -294,8 +294,12 @@ second place for auth-request point as n
Upon receiving response, client switches to editor command set.
Upon successful completion of edit, server sends auth-request.
After auth exchange completes, server sends commit-info.
+ If rev-props is present, logmsg is ignored. Only the svn:log entry in
+ rev-props (if any) will be used.
commit-info: ( new-rev:number date:string author:string
? ( post-commit-err:string ) )
+ NOTE: when revving this, make 'logmsg' optional, or delete that parameter
+ and have the log message specified in 'rev-props'.
get-file
params: ( path:string [ rev:number ] want-props:bool want-contents:bool
Modified: subversion/branches/1.8.x-busted-proxy/subversion/libsvn_subr/config_file.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x-busted-proxy/subversion/libsvn_subr/config_file.c?rev=1502106&r1=1502105&r2=1502106&view=diff
==============================================================================
--- subversion/branches/1.8.x-busted-proxy/subversion/libsvn_subr/config_file.c (original)
+++ subversion/branches/1.8.x-busted-proxy/subversion/libsvn_subr/config_file.c Thu Jul 11 04:06:08 2013
@@ -94,7 +94,7 @@ parser_getc(parse_context_t *ctx, int *c
}
else if (ctx->buffer_pos < ctx->buffer_size)
{
- *c = ctx->parser_buffer[ctx->buffer_pos];
+ *c = (unsigned char)ctx->parser_buffer[ctx->buffer_pos];
ctx->buffer_pos++;
}
else
@@ -107,7 +107,7 @@ parser_getc(parse_context_t *ctx, int *c
if (ctx->buffer_pos < ctx->buffer_size)
{
- *c = ctx->parser_buffer[ctx->buffer_pos];
+ *c = (unsigned char)ctx->parser_buffer[ctx->buffer_pos];
ctx->buffer_pos++;
}
else
@@ -131,7 +131,7 @@ parser_getc_plain(parse_context_t *ctx,
{
if (ctx->buffer_pos < ctx->buffer_size)
{
- *c = ctx->parser_buffer[ctx->buffer_pos];
+ *c = (unsigned char)ctx->parser_buffer[ctx->buffer_pos];
ctx->buffer_pos++;
return SVN_NO_ERROR;
@@ -189,6 +189,32 @@ skip_to_eoln(parse_context_t *ctx, int *
return SVN_NO_ERROR;
}
+/* Skip a UTF-8 Byte Order Mark if found. */
+static APR_INLINE svn_error_t *
+skip_bom(parse_context_t *ctx)
+{
+ int ch;
+
+ SVN_ERR(parser_getc(ctx, &ch));
+ if (ch == 0xEF)
+ {
+ const unsigned char *buf = (unsigned char *)ctx->parser_buffer;
+ /* This makes assumptions about the implementation of parser_getc and
+ * the use of skip_bom. Specifically that parser_getc() will get all
+ * of the BOM characters into the parse_context_t buffer. This can
+ * safely be assumed as long as we only try to use skip_bom() at the
+ * start of the stream and the buffer is longer than 3 characters. */
+ SVN_ERR_ASSERT(ctx->buffer_size > ctx->buffer_pos + 1);
+ if (buf[ctx->buffer_pos] == 0xBB && buf[ctx->buffer_pos + 1] == 0xBF)
+ ctx->buffer_pos += 2;
+ else
+ SVN_ERR(parser_ungetc(ctx, ch));
+ }
+ else
+ SVN_ERR(parser_ungetc(ctx, ch));
+
+ return SVN_NO_ERROR;
+}
/* Parse a single option value */
static svn_error_t *
@@ -450,6 +476,8 @@ svn_config__parse_stream(svn_config_t *c
ctx->buffer_pos = 0;
ctx->buffer_size = 0;
+ SVN_ERR(skip_bom(ctx));
+
do
{
SVN_ERR(skip_whitespace(ctx, &ch, &count));
Modified: subversion/branches/1.8.x-busted-proxy/subversion/libsvn_subr/gpg_agent.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x-busted-proxy/subversion/libsvn_subr/gpg_agent.c?rev=1502106&r1=1502105&r2=1502106&view=diff
==============================================================================
--- subversion/branches/1.8.x-busted-proxy/subversion/libsvn_subr/gpg_agent.c (original)
+++ subversion/branches/1.8.x-busted-proxy/subversion/libsvn_subr/gpg_agent.c Thu Jul 11 04:06:08 2013
@@ -156,42 +156,28 @@ send_option(int sd, char *buf, size_t n,
return (strncmp(buf, "OK", 2) == 0);
}
-/* Implementation of svn_auth__password_get_t that retrieves the password
- from gpg-agent */
+
+/* Locate a running GPG Agent, and return an open file descriptor
+ * for communication with the agent in *NEW_SD. If no running agent
+ * can be found, set *NEW_SD to -1. */
static svn_error_t *
-password_get_gpg_agent(svn_boolean_t *done,
- const char **password,
- apr_hash_t *creds,
- const char *realmstring,
- const char *username,
- apr_hash_t *parameters,
- svn_boolean_t non_interactive,
- apr_pool_t *pool)
+find_running_gpg_agent(int *new_sd, apr_pool_t *pool)
{
- int sd;
+ char *buffer;
char *gpg_agent_info = NULL;
+ const char *socket_name = NULL;
+ const char *request = NULL;
const char *p = NULL;
char *ep = NULL;
- char *buffer;
-
- apr_array_header_t *socket_details;
- const char *request = NULL;
- const char *cache_id = NULL;
- struct sockaddr_un addr;
- const char *tty_name;
- const char *tty_type;
- const char *lc_ctype;
- const char *display;
- const char *socket_name = NULL;
- svn_checksum_t *digest = NULL;
- char *password_prompt;
- char *realm_prompt;
+ int sd;
- *done = FALSE;
+ *new_sd = -1;
gpg_agent_info = getenv("GPG_AGENT_INFO");
if (gpg_agent_info != NULL)
{
+ apr_array_header_t *socket_details;
+
socket_details = svn_cstring_split(gpg_agent_info, ":", TRUE,
pool);
socket_name = APR_ARRAY_IDX(socket_details, 0, const char *);
@@ -201,6 +187,8 @@ password_get_gpg_agent(svn_boolean_t *do
if (socket_name != NULL)
{
+ struct sockaddr_un addr;
+
addr.sun_family = AF_UNIX;
strncpy(addr.sun_path, socket_name, sizeof(addr.sun_path) - 1);
addr.sun_path[sizeof(addr.sun_path) - 1] = '\0';
@@ -273,6 +261,44 @@ password_get_gpg_agent(svn_boolean_t *do
return SVN_NO_ERROR;
}
+ *new_sd = sd;
+ return SVN_NO_ERROR;
+}
+
+/* Implementation of svn_auth__password_get_t that retrieves the password
+ from gpg-agent */
+static svn_error_t *
+password_get_gpg_agent(svn_boolean_t *done,
+ const char **password,
+ apr_hash_t *creds,
+ const char *realmstring,
+ const char *username,
+ apr_hash_t *parameters,
+ svn_boolean_t non_interactive,
+ apr_pool_t *pool)
+{
+ int sd;
+ const char *p = NULL;
+ char *ep = NULL;
+ char *buffer;
+ const char *request = NULL;
+ const char *cache_id = NULL;
+ const char *tty_name;
+ const char *tty_type;
+ const char *lc_ctype;
+ const char *display;
+ svn_checksum_t *digest = NULL;
+ char *password_prompt;
+ char *realm_prompt;
+
+ *done = FALSE;
+
+ SVN_ERR(find_running_gpg_agent(&sd, pool));
+ if (sd == -1)
+ return SVN_NO_ERROR;
+
+ buffer = apr_palloc(pool, BUFFER_SIZE);
+
/* Send TTY_NAME to the gpg-agent daemon. */
tty_name = getenv("GPG_TTY");
if (tty_name != NULL)
@@ -283,11 +309,6 @@ password_get_gpg_agent(svn_boolean_t *do
return SVN_NO_ERROR;
}
}
- else
- {
- close(sd);
- return SVN_NO_ERROR;
- }
/* Send TTY_TYPE to the gpg-agent daemon. */
tty_type = getenv("TERM");
@@ -299,11 +320,6 @@ password_get_gpg_agent(svn_boolean_t *do
return SVN_NO_ERROR;
}
}
- else
- {
- close(sd);
- return SVN_NO_ERROR;
- }
/* Compute LC_CTYPE. */
lc_ctype = getenv("LC_ALL");
@@ -388,8 +404,8 @@ password_get_gpg_agent(svn_boolean_t *do
password in GPG Agent if that's how this particular integration
worked. But it isn't. GPG Agent stores the password provided by
the user via the pinentry program immediately upon its provision
- (and regardless of its accuracy as passwords go), so there's
- nothing really to do here. */
+ (and regardless of its accuracy as passwords go), so we just need
+ to check if a running GPG Agent exists. */
static svn_error_t *
password_set_gpg_agent(svn_boolean_t *done,
apr_hash_t *creds,
@@ -400,6 +416,15 @@ password_set_gpg_agent(svn_boolean_t *do
svn_boolean_t non_interactive,
apr_pool_t *pool)
{
+ int sd;
+
+ *done = FALSE;
+
+ SVN_ERR(find_running_gpg_agent(&sd, pool));
+ if (sd == -1)
+ return SVN_NO_ERROR;
+
+ close(sd);
*done = TRUE;
return SVN_NO_ERROR;
Modified: subversion/branches/1.8.x-busted-proxy/subversion/libsvn_wc/adm_ops.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x-busted-proxy/subversion/libsvn_wc/adm_ops.c?rev=1502106&r1=1502105&r2=1502106&view=diff
==============================================================================
--- subversion/branches/1.8.x-busted-proxy/subversion/libsvn_wc/adm_ops.c (original)
+++ subversion/branches/1.8.x-busted-proxy/subversion/libsvn_wc/adm_ops.c Thu Jul 11 04:06:08 2013
@@ -148,6 +148,7 @@ process_committed_leaf(svn_wc__db_t *db,
db, local_abspath,
FALSE /* keep_as_working */,
FALSE /* queue_deletes */,
+ TRUE /* remove_locks */,
(! via_recurse)
? new_revnum : SVN_INVALID_REVNUM,
NULL, NULL,
Modified: subversion/branches/1.8.x-busted-proxy/subversion/libsvn_wc/crop.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x-busted-proxy/subversion/libsvn_wc/crop.c?rev=1502106&r1=1502105&r2=1502106&view=diff
==============================================================================
--- subversion/branches/1.8.x-busted-proxy/subversion/libsvn_wc/crop.c (original)
+++ subversion/branches/1.8.x-busted-proxy/subversion/libsvn_wc/crop.c Thu Jul 11 04:06:08 2013
@@ -110,6 +110,7 @@ crop_children(svn_wc__db_t *db,
SVN_ERR(svn_wc__db_base_remove(db, child_abspath,
FALSE /* keep_as_working */,
FALSE /* queue_deletes */,
+ FALSE /* remove_locks */,
SVN_INVALID_REVNUM,
NULL, NULL, iterpool));
Modified: subversion/branches/1.8.x-busted-proxy/subversion/libsvn_wc/externals.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x-busted-proxy/subversion/libsvn_wc/externals.c?rev=1502106&r1=1502105&r2=1502106&view=diff
==============================================================================
--- subversion/branches/1.8.x-busted-proxy/subversion/libsvn_wc/externals.c (original)
+++ subversion/branches/1.8.x-busted-proxy/subversion/libsvn_wc/externals.c Thu Jul 11 04:06:08 2013
@@ -1413,6 +1413,7 @@ svn_wc__external_remove(svn_wc_context_t
SVN_ERR(svn_wc__db_base_remove(wc_ctx->db, local_abspath,
FALSE /* keep_as_working */,
TRUE /* queue_deletes */,
+ FALSE /* remove_locks */,
SVN_INVALID_REVNUM,
NULL, NULL, scratch_pool));
SVN_ERR(svn_wc__wq_run(wc_ctx->db, local_abspath,
Modified: subversion/branches/1.8.x-busted-proxy/subversion/libsvn_wc/update_editor.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x-busted-proxy/subversion/libsvn_wc/update_editor.c?rev=1502106&r1=1502105&r2=1502106&view=diff
==============================================================================
--- subversion/branches/1.8.x-busted-proxy/subversion/libsvn_wc/update_editor.c (original)
+++ subversion/branches/1.8.x-busted-proxy/subversion/libsvn_wc/update_editor.c Thu Jul 11 04:06:08 2013
@@ -924,6 +924,7 @@ mark_directory_edited(struct dir_baton *
do_notification(db->edit_baton, db->local_abspath, svn_node_dir,
svn_wc_notify_tree_conflict, scratch_pool);
db->already_notified = TRUE;
+
}
return SVN_NO_ERROR;
@@ -1813,6 +1814,7 @@ delete_entry(const char *path,
SVN_ERR(svn_wc__db_base_remove(eb->db, local_abspath,
FALSE /* keep_as_working */,
FALSE /* queue_deletes */,
+ FALSE /* remove_locks */,
SVN_INVALID_REVNUM /* not_present_rev */,
NULL, NULL,
scratch_pool));
@@ -1911,7 +1913,7 @@ delete_entry(const char *path,
{
/* Delete, and do not leave a not-present node. */
SVN_ERR(svn_wc__db_base_remove(eb->db, local_abspath,
- keep_as_working, queue_deletes,
+ keep_as_working, queue_deletes, FALSE,
SVN_INVALID_REVNUM /* not_present_rev */,
tree_conflict, NULL,
scratch_pool));
@@ -1920,7 +1922,7 @@ delete_entry(const char *path,
{
/* Delete, leaving a not-present node. */
SVN_ERR(svn_wc__db_base_remove(eb->db, local_abspath,
- keep_as_working, queue_deletes,
+ keep_as_working, queue_deletes, FALSE,
*eb->target_revision,
tree_conflict, NULL,
scratch_pool));
@@ -1939,8 +1941,19 @@ delete_entry(const char *path,
/* Notify. */
if (tree_conflict)
- do_notification(eb, local_abspath, svn_node_unknown,
- svn_wc_notify_tree_conflict, scratch_pool);
+ {
+ if (eb->conflict_func)
+ SVN_ERR(svn_wc__conflict_invoke_resolver(eb->db, local_abspath,
+ tree_conflict,
+ NULL /* merge_options */,
+ eb->conflict_func,
+ eb->conflict_baton,
+ eb->cancel_func,
+ eb->cancel_baton,
+ scratch_pool));
+ do_notification(eb, local_abspath, svn_node_unknown,
+ svn_wc_notify_tree_conflict, scratch_pool);
+ }
else
{
svn_wc_notify_action_t action = svn_wc_notify_update_delete;
@@ -2289,6 +2302,16 @@ add_directory(const char *path,
if (tree_conflict != NULL)
{
+ if (eb->conflict_func)
+ SVN_ERR(svn_wc__conflict_invoke_resolver(eb->db, db->local_abspath,
+ tree_conflict,
+ NULL /* merge_options */,
+ eb->conflict_func,
+ eb->conflict_baton,
+ eb->cancel_func,
+ eb->cancel_baton,
+ pool));
+
db->already_notified = TRUE;
do_notification(eb, db->local_abspath, svn_node_dir,
svn_wc_notify_tree_conflict, pool);
@@ -3380,6 +3403,16 @@ add_file(const char *path,
tree_conflict, NULL,
scratch_pool));
+ if (eb->conflict_func)
+ SVN_ERR(svn_wc__conflict_invoke_resolver(eb->db, fb->local_abspath,
+ tree_conflict,
+ NULL /* merge_options */,
+ eb->conflict_func,
+ eb->conflict_baton,
+ eb->cancel_func,
+ eb->cancel_baton,
+ scratch_pool));
+
fb->already_notified = TRUE;
do_notification(eb, fb->local_abspath, svn_node_file,
svn_wc_notify_tree_conflict, scratch_pool);
@@ -4703,6 +4736,7 @@ close_edit(void *edit_baton,
SVN_ERR(svn_wc__db_base_remove(eb->db, eb->target_abspath,
FALSE /* keep_as_working */,
FALSE /* queue_deletes */,
+ FALSE /* remove_locks */,
SVN_INVALID_REVNUM,
NULL, NULL, scratch_pool));
}
Modified: subversion/branches/1.8.x-busted-proxy/subversion/libsvn_wc/wc-queries.sql
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x-busted-proxy/subversion/libsvn_wc/wc-queries.sql?rev=1502106&r1=1502105&r2=1502106&view=diff
==============================================================================
--- subversion/branches/1.8.x-busted-proxy/subversion/libsvn_wc/wc-queries.sql (original)
+++ subversion/branches/1.8.x-busted-proxy/subversion/libsvn_wc/wc-queries.sql Thu Jul 11 04:06:08 2013
@@ -472,6 +472,10 @@ WHERE wc_id = ?1
DELETE FROM lock
WHERE repos_id = ?1 AND repos_relpath = ?2
+-- STMT_DELETE_LOCK_RECURSIVELY
+DELETE FROM lock
+WHERE repos_id = ?1 AND (repos_relpath = ?2 OR IS_STRICT_DESCENDANT_OF(repos_relpath, ?2))
+
-- STMT_CLEAR_BASE_NODE_RECURSIVE_DAV_CACHE
UPDATE nodes SET dav_cache = NULL
WHERE dav_cache IS NOT NULL AND wc_id = ?1 AND op_depth = 0
Modified: subversion/branches/1.8.x-busted-proxy/subversion/libsvn_wc/wc_db.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x-busted-proxy/subversion/libsvn_wc/wc_db.c?rev=1502106&r1=1502105&r2=1502106&view=diff
==============================================================================
--- subversion/branches/1.8.x-busted-proxy/subversion/libsvn_wc/wc_db.c (original)
+++ subversion/branches/1.8.x-busted-proxy/subversion/libsvn_wc/wc_db.c Thu Jul 11 04:06:08 2013
@@ -2086,6 +2086,7 @@ db_base_remove(svn_wc__db_wcroot_t *wcro
svn_wc__db_t *db, /* For checking conflicts */
svn_boolean_t keep_as_working,
svn_boolean_t queue_deletes,
+ svn_boolean_t remove_locks,
svn_revnum_t not_present_revision,
svn_skel_t *conflict,
svn_skel_t *work_items,
@@ -2106,6 +2107,16 @@ db_base_remove(svn_wc__db_wcroot_t *wcro
wcroot, local_relpath,
scratch_pool, scratch_pool));
+ if (remove_locks)
+ {
+ svn_sqlite__stmt_t *lock_stmt;
+
+ SVN_ERR(svn_sqlite__get_statement(&lock_stmt, wcroot->sdb,
+ STMT_DELETE_LOCK_RECURSIVELY));
+ SVN_ERR(svn_sqlite__bindf(lock_stmt, "is", repos_id, repos_relpath));
+ SVN_ERR(svn_sqlite__step_done(lock_stmt));
+ }
+
if (status == svn_wc__db_status_normal
&& keep_as_working)
{
@@ -2333,6 +2344,7 @@ svn_wc__db_base_remove(svn_wc__db_t *db,
const char *local_abspath,
svn_boolean_t keep_as_working,
svn_boolean_t queue_deletes,
+ svn_boolean_t remove_locks,
svn_revnum_t not_present_revision,
svn_skel_t *conflict,
svn_skel_t *work_items,
@@ -2349,7 +2361,7 @@ svn_wc__db_base_remove(svn_wc__db_t *db,
SVN_WC__DB_WITH_TXN(db_base_remove(wcroot, local_relpath,
db, keep_as_working, queue_deletes,
- not_present_revision,
+ remove_locks, not_present_revision,
conflict, work_items, scratch_pool),
wcroot);
@@ -10814,7 +10826,7 @@ commit_node(svn_wc__db_wcroot_t *wcroot,
svn_sqlite__stmt_t *lock_stmt;
SVN_ERR(svn_sqlite__get_statement(&lock_stmt, wcroot->sdb,
- STMT_DELETE_LOCK));
+ STMT_DELETE_LOCK_RECURSIVELY));
SVN_ERR(svn_sqlite__bindf(lock_stmt, "is", repos_id, repos_relpath));
SVN_ERR(svn_sqlite__step_done(lock_stmt));
}
@@ -11058,7 +11070,7 @@ bump_node_revision(svn_wc__db_wcroot_t *
revision != new_rev)))
{
return svn_error_trace(db_base_remove(wcroot, local_relpath,
- db, FALSE, FALSE,
+ db, FALSE, FALSE, FALSE,
SVN_INVALID_REVNUM,
NULL, NULL, scratch_pool));
}
Modified: subversion/branches/1.8.x-busted-proxy/subversion/libsvn_wc/wc_db.h
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x-busted-proxy/subversion/libsvn_wc/wc_db.h?rev=1502106&r1=1502105&r2=1502106&view=diff
==============================================================================
--- subversion/branches/1.8.x-busted-proxy/subversion/libsvn_wc/wc_db.h (original)
+++ subversion/branches/1.8.x-busted-proxy/subversion/libsvn_wc/wc_db.h Thu Jul 11 04:06:08 2013
@@ -702,6 +702,9 @@ svn_wc__db_base_add_not_present_node(svn
(With KEEP_AS_WORKING TRUE, this is a no-op, as everything is
automatically shadowed by the created copy)
+ If REMOVE_LOCKS is TRUE, all locks of this node and any subnodes
+ are also removed. This is to be done during commit of deleted nodes.
+
If NOT_PRESENT_REVISION specifies a valid revision a not-present
node is installed in BASE node with kind NOT_PRESENT_KIND after
deleting.
@@ -715,6 +718,7 @@ svn_wc__db_base_remove(svn_wc__db_t *db,
const char *local_abspath,
svn_boolean_t keep_as_working,
svn_boolean_t queue_deletes,
+ svn_boolean_t remove_locks,
svn_revnum_t not_present_revision,
svn_skel_t *conflict,
svn_skel_t *work_items,
Modified: subversion/branches/1.8.x-busted-proxy/subversion/libsvn_wc/wc_db_update_move.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x-busted-proxy/subversion/libsvn_wc/wc_db_update_move.c?rev=1502106&r1=1502105&r2=1502106&view=diff
==============================================================================
--- subversion/branches/1.8.x-busted-proxy/subversion/libsvn_wc/wc_db_update_move.c (original)
+++ subversion/branches/1.8.x-busted-proxy/subversion/libsvn_wc/wc_db_update_move.c Thu Jul 11 04:06:08 2013
@@ -1988,8 +1988,12 @@ svn_wc__db_update_moved_away_conflict_vi
/* Send all queued up notifications. */
SVN_ERR(svn_wc__db_update_move_list_notify(wcroot,
- old_version->peg_rev,
- new_version->peg_rev,
+ (old_version
+ ? old_version->peg_rev
+ : SVN_INVALID_REVNUM),
+ (new_version
+ ? new_version->peg_rev
+ : SVN_INVALID_REVNUM),
notify_func, notify_baton,
scratch_pool));
if (notify_func)
@@ -2395,7 +2399,9 @@ svn_wc__db_resolve_delete_raise_moved_aw
wcroot);
SVN_ERR(svn_wc__db_update_move_list_notify(wcroot,
- old_version->peg_rev,
+ (old_version
+ ? old_version->peg_rev
+ : SVN_INVALID_REVNUM),
(new_version
? new_version->peg_rev
: SVN_INVALID_REVNUM),
Modified: subversion/branches/1.8.x-busted-proxy/subversion/libsvn_wc/workqueue.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x-busted-proxy/subversion/libsvn_wc/workqueue.c?rev=1502106&r1=1502105&r2=1502106&view=diff
==============================================================================
--- subversion/branches/1.8.x-busted-proxy/subversion/libsvn_wc/workqueue.c (original)
+++ subversion/branches/1.8.x-busted-proxy/subversion/libsvn_wc/workqueue.c Thu Jul 11 04:06:08 2013
@@ -143,6 +143,7 @@ run_base_remove(work_item_baton_t *wqb,
SVN_ERR(svn_wc__db_base_remove(db, local_abspath,
FALSE /* keep_as_working */,
TRUE /* queue_deletes */,
+ FALSE /* remove_locks */,
not_present_rev,
NULL, NULL, scratch_pool));