Author: rhuijben
Date: Tue Apr 19 23:49:27 2011
New Revision: 1095238
URL: http://svn.apache.org/viewvc?rev=1095238&view=rev
Log:
I should really press ^S when removing SVN_DBG() calls before committing.
* subversion/libsvn_wc/merge.c
(preserve_pre_merge_files): Following up on r1095237, remove SVN_DBG() call.
Modified:
subversion/trunk/subversion/libsvn_wc/merge.c
Modified: subversion/trunk/subversion/libsvn_wc/merge.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/merge.c?rev=1095238&r1=1095237&r2=1095238&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/merge.c (original)
+++ subversion/trunk/subversion/libsvn_wc/merge.c Tue Apr 19 23:49:27 2011
@@ -700,7 +700,6 @@ preserve_pre_merge_files(svn_skel_t **wo
Make our LEFT and RIGHT files 'local' if they aren't... */
if (! svn_dirent_is_ancestor(wcroot_abspath, left_abspath))
{
- SVN_DBG(("Left abspath was %s\n", left_abspath));
SVN_ERR(svn_io_open_unique_file3(NULL, &tmp_left, temp_dir_abspath,
svn_io_file_del_none,
scratch_pool, scratch_pool));
