[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Proposed changes to mod_dav_svn/merge.c

From: <cmpilato_at_collab.net>
Date: 2001-10-16 20:44:32 CEST

Currently, mod_dav_svn is sending reponses back during the commit
process to the client for things which we generally don't want to
"bump". The general rule is that we only bump directories if they are
committed objects, and that only occurs when a property of that
directory has been modified.

I have about 60% confidence that this is the right solution, mostly
because I'm not sure if not sending a response at all for certain
directories is too much of an information loss from the client's point
of view.

Comments (and perhaps some honest knowledge :-) welcome.

------

Index: mod_dav_svn/merge.c
===================================================================
--- mod_dav_svn/.svn/text-base/merge.c Wed Oct 3 15:14:13 2001
+++ mod_dav_svn/merge.c Tue Oct 16 13:40:47 2001
@@ -179,18 +179,6 @@
   return NULL;
 }
 
-static svn_error_t *mr_delete_entry(svn_stringbuf_t *name,
- void *parent_baton)
-{
- mr_baton *parent = parent_baton;
-
- /* Removing an item is an explicit change to the parent. Mark it so the
- client will get the data on the new parent. */
- parent->seen_change = TRUE;
-
- return NULL;
-}
-
 static svn_error_t *mr_add_directory(svn_stringbuf_t *name,
                                      void *parent_baton,
                                      svn_stringbuf_t *copyfrom_path,
@@ -206,10 +194,6 @@
 
   /* the response for this directory will occur at close_directory time */
 
- /* Adding a subdir is an explicit change to the parent. Mark it so the
- client will get the data on the new parent. */
- parent->seen_change = TRUE;
-
   *child_baton = subdir;
   return NULL;
 }
@@ -269,10 +253,6 @@
 
   /* We wait until close_file to issue a response for this. */
 
- /* Adding a file is an explicit change to the parent. Mark it so the
- client will get the data on the new parent. */
- parent->seen_change = TRUE;
-
   *file_baton = file;
   return NULL;
 }
@@ -388,7 +368,6 @@
   /* set up the editor for the delta process */
   editor = svn_delta_default_editor(pool);
   editor->replace_root = mr_replace_root;
- editor->delete_entry = mr_delete_entry;
   editor->add_directory = mr_add_directory;
   editor->replace_directory = mr_replace_directory;
   editor->change_dir_prop = mr_change_dir_prop;

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sat Oct 21 14:36:44 2006

This is an archived mail posted to the Subversion Dev mailing list.