Author: cmpilato
Date: Tue Dec 15 19:28:09 2009
New Revision: 890956
URL: http://svn.apache.org/viewvc?rev=890956&view=rev
Log:
Sync the 'issue-3550-dev' branch up with trunk.
(Merged /subversion/trunk:r890874-890955)
Modified:
subversion/branches/issue-3550-dev/ (props changed)
subversion/branches/issue-3550-dev/subversion/libsvn_fs_base/obliterate.c
Propchange: subversion/branches/issue-3550-dev/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Dec 15 19:28:09 2009
@@ -32,4 +32,4 @@
/subversion/branches/tc_url_rev:874351-874483
/subversion/branches/tree-conflicts:868291-873154
/subversion/branches/tree-conflicts-notify:873926-874008
-/subversion/trunk:889714-890873
+/subversion/trunk:889714-890955
Modified:
subversion/branches/issue-3550-dev/subversion/libsvn_fs_base/obliterate.c
URL:
http://svn.apache.org/viewvc/subversion/branches/issue-3550-dev/subversion/libsvn_fs_base/obliterate.c?rev=890956&r1=890955&r2=890956&view=diff
==============================================================================
--- subversion/branches/issue-3550-dev/subversion/libsvn_fs_base/obliterate.c
(original)
+++ subversion/branches/issue-3550-dev/subversion/libsvn_fs_base/obliterate.c
Tue Dec 15 19:28:09 2009
@@ -187,8 +187,9 @@
}
else if (noderev->kind == svn_node_file)
{
- SVN_ERR(svn_fs_base__rep_dup(&noderev->data_key, new_txn_id,
- noderev->data_key, trail, scratch_pool));
+ if (noderev->data_key)
+ SVN_ERR(svn_fs_base__rep_dup(&noderev->data_key, new_txn_id,
+ noderev->data_key, trail, scratch_pool));
SVN_ERR(svn_fs_bdb__put_node_revision(trail->fs, *new_id, noderev, trail,
scratch_pool));
