diff options
| author | peter <peter@FreeBSD.org> | 2013-07-28 05:04:41 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 2013-07-28 05:04:41 +0000 |
| commit | 3b9f7e96381479fb03ae2c36d490a38718f71083 (patch) | |
| tree | a851d66ec0c51a7321b30a677a0e55f1655af4d6 /subversion/libsvn_wc/wc_db_update_move.c | |
| parent | 6879a90da0ad9b5e74fc212c899751fe3821ac7b (diff) | |
| download | FreeBSD-src-3b9f7e96381479fb03ae2c36d490a38718f71083.zip FreeBSD-src-3b9f7e96381479fb03ae2c36d490a38718f71083.tar.gz | |
Import subversion-1.8.1 into vendor staging area.
Diffstat (limited to 'subversion/libsvn_wc/wc_db_update_move.c')
| -rw-r--r-- | subversion/libsvn_wc/wc_db_update_move.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/subversion/libsvn_wc/wc_db_update_move.c b/subversion/libsvn_wc/wc_db_update_move.c index fa5afe4..a8cce76 100644 --- a/subversion/libsvn_wc/wc_db_update_move.c +++ b/subversion/libsvn_wc/wc_db_update_move.c @@ -1988,8 +1988,12 @@ svn_wc__db_update_moved_away_conflict_victim(svn_wc__db_t *db, /* 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_away(svn_wc__db_t *db, 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), |
