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

Re: svn commit: r33900 - trunk/subversion/libsvn_wc

From: Greg Stein <gstein_at_gmail.com>
Date: Tue, 28 Oct 2008 11:06:03 -0700

Why is it horrible? How are you tracking that you need to research
these questions? Or maybe somebody else knows the answers.

On Mon, Oct 27, 2008 at 9:19 AM, <julianfoad_at_tigris.org> wrote:
> Author: julianfoad
> Date: Mon Oct 27 09:19:23 2008
> New Revision: 33900
>
> Log:
> Remove some question-comments that I inserted in the tree-conflicts branch
> and then merged to trunk without resolving. (I still don't know the answers
> but inserting question-comments is horrible.)
>
> * subversion/libsvn_wc/update_editor.c
> (do_entry_deletion, add_directory, add_file): Delete question-comments.
>
> Modified:
> trunk/subversion/libsvn_wc/update_editor.c
>
> Modified: trunk/subversion/libsvn_wc/update_editor.c
> URL: http://svn.collab.net/viewvc/svn/trunk/subversion/libsvn_wc/update_editor.c?pathrev=33900&r1=33899&r2=33900
> ==============================================================================
> --- trunk/subversion/libsvn_wc/update_editor.c Mon Oct 27 09:00:11 2008 (r33899)
> +++ trunk/subversion/libsvn_wc/update_editor.c Mon Oct 27 09:19:23 2008 (r33900)
> @@ -1359,13 +1359,13 @@ do_entry_deletion(struct edit_baton *eb,
>
> tmp_entry.revision = *(eb->target_revision);
> tmp_entry.kind =
> - (entry->kind == svn_node_file) ? svn_node_file : svn_node_dir; /* ### redundant? */
> + (entry->kind == svn_node_file) ? svn_node_file : svn_node_dir;
> tmp_entry.deleted = TRUE;
>
> SVN_ERR(svn_wc__loggy_entry_modify(&log_item, adm_access,
> full_path, &tmp_entry,
> SVN_WC__ENTRY_MODIFY_REVISION
> - | SVN_WC__ENTRY_MODIFY_KIND /* ### redundant change? */
> + | SVN_WC__ENTRY_MODIFY_KIND
> | SVN_WC__ENTRY_MODIFY_DELETED,
> pool));
>
> @@ -1550,7 +1550,6 @@ add_directory(const char *path,
>
> /* Anything other than a dir scheduled for addition without
> history is an error. */
> - /* ### what's this "add_existed" clause for? */
> if (entry
> && entry->schedule == svn_wc_schedule_add
> && ! entry->copied)
> @@ -2541,8 +2540,6 @@ add_file(const char *path,
> /* When adding, there should be nothing with this name unless unversioned
> obstructions are permitted or the obstruction is scheduled for addition
> (or replacement) without history. */
> - /* ### " or the obstruction is scheduled for addition
> - without history." ??? */
> if (kind != svn_node_none)
> {
> if (eb->allow_unver_obstructions
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: svn-unsubscribe_at_subversion.tigris.org
> For additional commands, e-mail: svn-help_at_subversion.tigris.org
>
>

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-10-28 19:06:25 CET

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