What can I do to help svn out when there's a corrupted update?
I just updated svn to rev 3121 on my Windows 2000 box and the
file subversion/libsvn_client/commit_util.c has some garbage
in it starting at line 763.
I haven't been working on this file at all.
Here's a diff between rev 3121 of the file from my Linux box
to the file on my Windows 2000 box:
--- commit_util.c 2002-09-03 09:55:19.000000000 -0700
+++ subversion/libsvn_client/commit_util.c 2002-09-03 09:48:36.000000000 -0700
@@ -760,30 +760,55 @@
if ((item->state_flags & SVN_CLIENT_COMMIT_ITEM_DELETE)
&& (item->state_flags & SVN_CLIENT_COMMIT_ITEM_ADD))
{
+ itor, don't print "(bin)"e fou (pusr binCOMMIT_Ds when editor, NULL,termining, only when addi
+ So we don't bothece)
+ get
+ the mime-file_here. */
+ {
/* We don't print the "(bin)" notice for binary files when
- replacing, only when adding. So we don't bother to get
- the mime-type here. */
- (*notify_func) (notify_baton, path, svn_wc_notify_commit_replaced,
- item->kind,
+ replaci
+ else if ((item->state_flags & SVN_CLIENT_COMMIT_ITEM_TEXT_MODS)
+ mime-type here. */
+ (*notify_func) (notify_b
+ mime-type here. */
+ (*notify_func) (notify_b
+ OMMIT_ITEM_PROP_MODS);
+
+ (,
NULL,
+ svn_wc_not{
+ ify_state_unknown,
svn_wc_notify_state_unknown,
- svn_wc_notify_state_unknown,
- SVN_INVALID_REVNUM);
- }
- else if (item->state_flags & SVN_CLIENT_COMMIT_ITEM_DELETE)
- {
- (*notify_func) (notify_baton, path, svn_wc_notify_commit_deleted,
- item->kind,
+
+ else if ((item->state_flags & SVN_CLIENT_COMMIT_ITEM_TEXT_MODS)
+ mime-type here. */
+ (*notify_func) (notify_b
+ mime-type here. */
+ (*notify_func) (notify_b
+ OMMIT_ITEM_PROP_MODS);
+
+ (,
NULL,
- svn_wc_notify_state_unknown,
- svn_wc_notify_state_unknown,
- SVN_INVALID_REVNUM);
- }
- else if (item->state_flags & SVN_CLIENT_COMMIT_ITEM_ADD)
- {
- const svn_string_t *propval = NULL;
+ NULL,
+ {
+ const on,
+
+ sval = NULL;
+
+ and the paritem->kind == svn_node_file)
+ SVN_ERR (svn_wc_prop_gett_postfix_txdelta,
+ (&propval, SVN_PROP_MIME_TYPE, item->path, pool) svn_wc_notify_state_unknown,
+ svn_wc_no
+ else if ((item->state_flags & SVN
+ sval ?N
+ sval Openinly replace it with a NUT_MODS)
+ mime-type here. */
+ (*notify_func) (notify_b
+ mime-type here. */
+ (*notify_func) (notify_b
+ OMMIT_ITEM_PROP_MODS);
- if (item->kind == svn_node_file)
+ e_file)
SVN_ERR (svn_wc_prop_get
(&propval, SVN_PROP_MIME_TYPE, item->path, pool));
@@ -1236,24 +1261,4 @@
ed->add_directory = add_item;
ed->open_directory = open_item;
ed->close_directory = close_item;
- ed->add_file = add_item;
- ed->open_file = open_item;
- ed->close_file = close_item;
- ed->delete_entry = delete_entry;
- ed->apply_textdelta = apply_textdelta;
- ed->change_dir_prop = change_prop;
- ed->change_file_prop = change_prop;
- ed->close_edit = close_edit;
-
- *editor = ed;
- *edit_baton = eb;
- return SVN_NO_ERROR;
-}
-#endif /* SVN_CLIENT_COMMIT_DEBUG */
-
-
-/*
- * local variables:
- * eval: (load-file "../../tools/dev/svn-dev.el")
- * end: */
-
+ ed
\ No newline at end of file
Best,
Blair
--
Blair Zajac <blair@orcaware.com>
Web and OS performance plots - http://www.orcaware.com/orca/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Sep 3 19:01:16 2002