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

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

From: Hyrum K. Wright <hyrum_wright_at_mail.utexas.edu>
Date: Thu, 5 Mar 2009 22:53:08 -0600

Bah. On third inspection, it looks like something else broke the
buildbot, but this was just the last rev before the buildslave kicked
off again. I'll re-apply it tomorrow.

-Hyrum "why do something in one rev, when you can do it in 3" Wright

On Mar 5, 2009, at 10:36 PM, Hyrum K. Wright wrote:

> Author: hwright
> Date: Thu Mar 5 20:36:58 2009
> New Revision: 36362
>
> Log:
> Revert r36358 due to some failing tests. Although it may be useful
> later
> on to remove this parameter, we may need to wait until after wc-ng
> goes
> mainstream.
>
> Modified:
> trunk/subversion/libsvn_wc/adm_crawler.c
> trunk/subversion/libsvn_wc/adm_ops.c
> trunk/subversion/libsvn_wc/copy.c
> trunk/subversion/libsvn_wc/entries.c
> trunk/subversion/libsvn_wc/entries.h
> trunk/subversion/libsvn_wc/log.c
> trunk/subversion/libsvn_wc/questions.c
> trunk/subversion/libsvn_wc/relocate.c
> trunk/subversion/libsvn_wc/update_editor.c
>
> Modified: trunk/subversion/libsvn_wc/adm_crawler.c
> URL: http://svn.collab.net/viewvc/svn/trunk/subversion/libsvn_wc/adm_crawler.c?pathrev=36362&r1=36361&r2=36362
> =
> =
> =
> =
> =
> =
> =
> =
> ======================================================================
> --- trunk/subversion/libsvn_wc/adm_crawler.c Thu Mar 5 18:06:29
> 2009 (r36361)
> +++ trunk/subversion/libsvn_wc/adm_crawler.c Thu Mar 5 20:36:58
> 2009 (r36362)
> @@ -149,7 +149,8 @@ restore_file(const char *file_path,
>
> /* Modify our entry's text-timestamp to match the working file. */
> return svn_wc__entry_modify(adm_access,
> svn_dirent_basename(file_path, pool),
> - &newentry,
> SVN_WC__ENTRY_MODIFY_TEXT_TIME, pool);
> + &newentry,
> SVN_WC__ENTRY_MODIFY_TEXT_TIME,
> + TRUE /* do_sync now */, pool);
> }
>
>
>
> Modified: trunk/subversion/libsvn_wc/adm_ops.c
> URL: http://svn.collab.net/viewvc/svn/trunk/subversion/libsvn_wc/adm_ops.c?pathrev=36362&r1=36361&r2=36362
> =
> =
> =
> =
> =
> =
> =
> =
> ======================================================================
> --- trunk/subversion/libsvn_wc/adm_ops.c Thu Mar 5 18:06:29 2009
> (r36361)
> +++ trunk/subversion/libsvn_wc/adm_ops.c Thu Mar 5 20:36:58 2009
> (r36362)
> @@ -923,7 +923,7 @@ mark_tree(svn_wc_adm_access_t *adm_acces
> (adm_access, base_name, &tmp_entry,
> modify_flags & (SVN_WC__ENTRY_MODIFY_SCHEDULE
> | SVN_WC__ENTRY_MODIFY_COPIED),
> - subpool));
> + TRUE, subpool));
>
> if (copied)
> /* Remove now obsolete wcprops */
> @@ -970,7 +970,7 @@ mark_tree(svn_wc_adm_access_t *adm_acces
> /* Modify this_dir entry if requested. */
> if (this_dir_flags)
> SVN_ERR(svn_wc__entry_modify(adm_access, NULL, &tmp_entry,
> this_dir_flags,
> - subpool));
> + TRUE, subpool));
>
> /* Destroy our per-iteration pool. */
> svn_pool_destroy(subpool);
> @@ -1484,7 +1484,7 @@ svn_wc_add3(const char *path,
> /* Now, add the entry for this item to the parent_dir's
> entries file, marking it for addition. */
> SVN_ERR(svn_wc__entry_modify(parent_access, base_name, &tmp_entry,
> - modify_flags, pool));
> + modify_flags, TRUE, pool));
>
>
> /* If this is a replacement without history, we need to reset the
> @@ -1576,7 +1576,7 @@ svn_wc_add3(const char *path,
> : svn_wc_schedule_add;
> tmp_entry.incomplete = FALSE;
> SVN_ERR(svn_wc__entry_modify(adm_access, NULL, &tmp_entry,
> - modify_flags, pool));
> + modify_flags, TRUE, pool));
>
> if (copyfrom_url)
> {
> @@ -2113,12 +2113,12 @@ revert_entry(svn_depth_t *depth,
> SVN_ERR(svn_wc__entry_modify(parent_access, basey,
> tmpentry,
> SVN_WC__ENTRY_MODIFY_KIND
> |
> SVN_WC__ENTRY_MODIFY_DELETED,
> - pool));
> + TRUE, pool));
> else
> SVN_ERR(svn_wc__entry_modify(parent_access, bname,
> tmpentry,
> SVN_WC__ENTRY_MODIFY_KIND
> |
> SVN_WC__ENTRY_MODIFY_DELETED,
> - pool));
> + TRUE, pool));
> }
> }
> /* Regular prop and text edit. */
> @@ -2507,6 +2507,7 @@ svn_wc_remove_from_revision_control(svn_
> SVN_WC_ENTRY_THIS_DIR,
> &incomplete_entry,
> SVN_WC__ENTRY_MODIFY_INCOMPLETE,
> + TRUE, /* sync to disk
> immediately */
> pool));
>
> /* Get rid of all the wcprops in this directory. This avoids
> rewriting
> @@ -2855,7 +2856,7 @@ resolve_conflict_on_entry(const char *pa
> SVN_ERR(svn_wc__entry_modify
> (conflict_dir,
> (entry->kind == svn_node_dir ? NULL : base_name),
> - entry, modify_flags, pool));
> + entry, modify_flags, TRUE, pool));
>
> /* No feedback if no files were deleted and all we did was
> change the
> entry, such a file did not appear as a conflict */
> @@ -3080,7 +3081,7 @@ svn_error_t *svn_wc_add_lock(const char
> | SVN_WC__ENTRY_MODIFY_LOCK_OWNER
> | SVN_WC__ENTRY_MODIFY_LOCK_COMMENT
> |
> SVN_WC__ENTRY_MODIFY_LOCK_CREATION_DATE,
> - pool));
> + TRUE, pool));
>
> { /* if svn:needs-lock is present, then make the file read-write. */
> const svn_string_t *needs_lock;
> @@ -3109,7 +3110,7 @@ svn_error_t *svn_wc_remove_lock(const ch
> | SVN_WC__ENTRY_MODIFY_LOCK_OWNER
> | SVN_WC__ENTRY_MODIFY_LOCK_COMMENT
> |
> SVN_WC__ENTRY_MODIFY_LOCK_CREATION_DATE,
> - pool));
> + TRUE, pool));
>
> { /* if svn:needs-lock is present, then make the file read-only. */
> const svn_string_t *needs_lock;
> @@ -3181,7 +3182,7 @@ svn_wc_set_changelist(const char *path,
> /* Tweak the entry. */
> newentry.changelist = changelist;
> SVN_ERR(svn_wc__entry_modify(adm_access, entry->name, &newentry,
> - SVN_WC__ENTRY_MODIFY_CHANGELIST,
> pool));
> + SVN_WC__ENTRY_MODIFY_CHANGELIST,
> TRUE, pool));
>
> /* And tell someone what we've done. */
> if (notify_func)
> @@ -3228,6 +3229,9 @@ svn_wc__set_file_external_location(svn_w
> entry.file_external_rev.kind = svn_opt_revision_unspecified;
> }
>
> - return svn_wc__entry_modify(adm_access, name, &entry,
> - SVN_WC__ENTRY_MODIFY_FILE_EXTERNAL,
> pool);
> + SVN_ERR(svn_wc__entry_modify(adm_access, name, &entry,
> + SVN_WC__ENTRY_MODIFY_FILE_EXTERNAL,
> TRUE,
> + pool));
> +
> + return SVN_NO_ERROR;
> }
>
> Modified: trunk/subversion/libsvn_wc/copy.c
> URL: http://svn.collab.net/viewvc/svn/trunk/subversion/libsvn_wc/copy.c?pathrev=36362&r1=36361&r2=36362
> =
> =
> =
> =
> =
> =
> =
> =
> ======================================================================
> --- trunk/subversion/libsvn_wc/copy.c Thu Mar 5 18:06:29 2009
> (r36361)
> +++ trunk/subversion/libsvn_wc/copy.c Thu Mar 5 20:36:58 2009
> (r36362)
> @@ -722,7 +722,8 @@ post_copy_cleanup(svn_wc_adm_access_t *a
> /* If we meaningfully modified the flags, we must be wanting to
> change the entry. */
> if (flags != SVN_WC__ENTRY_MODIFY_FORCE)
> - SVN_ERR(svn_wc__entry_modify(adm_access, key, entry, flags,
> subpool));
> + SVN_ERR(svn_wc__entry_modify(adm_access, key, entry,
> + flags, TRUE, subpool));
>
> /* If a dir, not deleted, and not "this dir", recurse. */
> if ((! deleted)
> @@ -836,7 +837,7 @@ copy_dir_administratively(const char *sr
> tmp_entry.url = apr_pstrdup(pool, copyfrom_url);
> SVN_ERR(svn_wc__entry_modify(adm_access, NULL, /* This Dir */
> &tmp_entry,
> - SVN_WC__ENTRY_MODIFY_URL,
> + SVN_WC__ENTRY_MODIFY_URL, TRUE,
> pool));
> }
> else
>
> Modified: trunk/subversion/libsvn_wc/entries.c
> URL: http://svn.collab.net/viewvc/svn/trunk/subversion/libsvn_wc/entries.c?pathrev=36362&r1=36361&r2=36362
> =
> =
> =
> =
> =
> =
> =
> =
> ======================================================================
> --- trunk/subversion/libsvn_wc/entries.c Thu Mar 5 18:06:29 2009
> (r36361)
> +++ trunk/subversion/libsvn_wc/entries.c Thu Mar 5 20:36:58 2009
> (r36362)
> @@ -2474,6 +2474,7 @@ svn_wc__entry_modify(svn_wc_adm_access_t
> const char *name,
> svn_wc_entry_t *entry,
> apr_uint64_t modify_flags,
> + svn_boolean_t do_sync,
> apr_pool_t *pool)
> {
> apr_hash_t *entries, *entries_nohidden;
> @@ -2544,7 +2545,10 @@ svn_wc__entry_modify(svn_wc_adm_access_t
> }
>
> /* Sync changes to disk. */
> - return svn_wc__entries_write(entries, adm_access, pool);
> + if (do_sync)
> + SVN_ERR(svn_wc__entries_write(entries, adm_access, pool));
> +
> + return SVN_NO_ERROR;
> }
>
>
> @@ -3245,7 +3249,7 @@ svn_wc_mark_missing_deleted(const char *
> (SVN_WC__ENTRY_MODIFY_DELETED
> | SVN_WC__ENTRY_MODIFY_SCHEDULE
> | SVN_WC__ENTRY_MODIFY_FORCE),
> - pool);
> + TRUE, /* sync right away */ pool);
> }
> else
> return svn_error_createf(SVN_ERR_WC_PATH_FOUND, NULL,
>
> Modified: trunk/subversion/libsvn_wc/entries.h
> URL: http://svn.collab.net/viewvc/svn/trunk/subversion/libsvn_wc/entries.h?pathrev=36362&r1=36361&r2=36362
> =
> =
> =
> =
> =
> =
> =
> =
> ======================================================================
> --- trunk/subversion/libsvn_wc/entries.h Thu Mar 5 18:06:29 2009
> (r36361)
> +++ trunk/subversion/libsvn_wc/entries.h Thu Mar 5 20:36:58 2009
> (r36362)
> @@ -172,6 +172,12 @@ svn_error_t *svn_wc__atts_to_entry(svn_w
> NAME can be NULL to specify that the caller wishes to modify the
> "this dir" entry in ADM_ACCESS.
>
> + If DO_SYNC is FALSE then the modification will be entirely local
> to the
> + access baton, if DO_SYNC is TRUE the modification will be
> written to
> + the entries file. Be careful when setting DO_SYNC to FALSE: if
> there
> + is no subsequent svn_wc__entries_write call the modifications
> will be
> + lost when the access baton is closed.
> +
> "Folding in" a change means, in most cases, simply replacing the
> field
> with the new value. However, for the "schedule" field, unless
> MODIFY_FLAGS includes SVN_WC__ENTRY_MODIFY_FORCE (in which case
> just take
> @@ -184,11 +190,12 @@ svn_error_t *svn_wc__atts_to_entry(svn_w
> Perform all allocations in POOL.
>
> NOTE: when you call this function, the entries file will be read,
> - tweaked and written back out. */
> + tweaked and finally, if DO_SYNC is TRUE, written back out. */
> svn_error_t *svn_wc__entry_modify(svn_wc_adm_access_t *adm_access,
> const char *name,
> svn_wc_entry_t *entry,
> apr_uint64_t modify_flags,
> + svn_boolean_t do_sync,
> apr_pool_t *pool);
>
> /* Remove entry NAME from ENTRIES, unconditionally. PARENT_DIR
> should be
>
> Modified: trunk/subversion/libsvn_wc/log.c
> URL: http://svn.collab.net/viewvc/svn/trunk/subversion/libsvn_wc/log.c?pathrev=36362&r1=36361&r2=36362
> =
> =
> =
> =
> =
> =
> =
> =
> ======================================================================
> --- trunk/subversion/libsvn_wc/log.c Thu Mar 5 18:06:29 2009 (r36361)
> +++ trunk/subversion/libsvn_wc/log.c Thu Mar 5 20:36:58 2009 (r36362)
> @@ -833,7 +833,7 @@ log_do_modify_entry(struct log_runner *l
>
> /* Now write the new entry out */
> err = svn_wc__entry_modify(loggy->adm_access, name,
> - entry, modify_flags, loggy->pool);
> + entry, modify_flags, FALSE, loggy-
> >pool);
> if (err)
> return svn_error_createf(pick_error_code(loggy), err,
> _("Error modifying entry for '%s'"),
> name);
> @@ -859,7 +859,7 @@ log_do_delete_lock(struct log_runner *lo
> | SVN_WC__ENTRY_MODIFY_LOCK_OWNER
> | SVN_WC__ENTRY_MODIFY_LOCK_COMMENT
> |
> SVN_WC__ENTRY_MODIFY_LOCK_CREATION_DATE,
> - loggy->pool);
> + FALSE, loggy->pool);
> if (err)
> return svn_error_createf(pick_error_code(loggy), err,
> _("Error removing lock from entry for
> '%s'"),
> @@ -882,7 +882,7 @@ log_do_delete_changelist(struct log_runn
> err = svn_wc__entry_modify(loggy->adm_access, name,
> &entry,
> SVN_WC__ENTRY_MODIFY_CHANGELIST,
> - loggy->pool);
> + FALSE, loggy->pool);
> if (err)
> return svn_error_createf(pick_error_code(loggy), err,
> _("Error removing changelist from entry
> '%s'"),
> @@ -1125,7 +1125,7 @@ log_do_committed(struct log_runner *logg
> SVN_ERR(svn_wc__entry_modify
> (loggy->adm_access, NULL, &tmpentry,
> SVN_WC__ENTRY_MODIFY_REVISION |
> SVN_WC__ENTRY_MODIFY_KIND,
> - pool));
> + FALSE, pool));
> loggy->entries_modified = TRUE;
>
> /* Drop the 'killme' file. */
> @@ -1177,7 +1177,7 @@ log_do_committed(struct log_runner *logg
> SVN_WC__ENTRY_MODIFY_REVISION
> | SVN_WC__ENTRY_MODIFY_KIND
> | SVN_WC__ENTRY_MODIFY_DELETED,
> - pool));
> + FALSE, pool));
> loggy->entries_modified = TRUE;
> }
>
> @@ -1363,7 +1363,7 @@ log_do_committed(struct log_runner *logg
> | SVN_WC__ENTRY_MODIFY_COPYFROM_URL
> | SVN_WC__ENTRY_MODIFY_COPYFROM_REV
> | SVN_WC__ENTRY_MODIFY_FORCE),
> - pool)))
> + FALSE, pool)))
> return svn_error_createf
> (pick_error_code(loggy), err,
> _("Error modifying entry of '%s'"), name);
> @@ -1413,7 +1413,7 @@ log_do_committed(struct log_runner *logg
> | SVN_WC__ENTRY_MODIFY_COPIED
> |
> SVN_WC__ENTRY_MODIFY_DELETED
> |
> SVN_WC__ENTRY_MODIFY_FORCE),
> - pool)))
> + TRUE, pool)))
> return svn_error_createf(pick_error_code(loggy), err,
> _("Error modifying entry of
> '%s'"), name);
> }
> @@ -1682,7 +1682,7 @@ handle_killme(svn_wc_adm_access_t *adm_a
> SVN_WC__ENTRY_MODIFY_REVISION
> | SVN_WC__ENTRY_MODIFY_KIND
> | SVN_WC__ENTRY_MODIFY_DELETED,
> - pool));
> + TRUE, pool));
> }
> }
> return SVN_NO_ERROR;
> @@ -1855,7 +1855,7 @@ run_log(svn_wc_adm_access_t *adm_access,
> err = svn_wc__entry_modify(adm_access, SVN_WC_ENTRY_THIS_DIR,
> &tmp_entry,
>
> SVN_WC__ENTRY_MODIFY_TREE_CONFLICT_DATA,
> - pool);
> + FALSE, pool);
> if (err)
> return svn_error_createf(pick_error_code(loggy), err,
> _("Error recording tree conflicts
> in '%s'"),
>
> Modified: trunk/subversion/libsvn_wc/questions.c
> URL: http://svn.collab.net/viewvc/svn/trunk/subversion/libsvn_wc/questions.c?pathrev=36362&r1=36361&r2=36362
> =
> =
> =
> =
> =
> =
> =
> =
> ======================================================================
> --- trunk/subversion/libsvn_wc/questions.c Thu Mar 5 18:06:29 2009
> (r36361)
> +++ trunk/subversion/libsvn_wc/questions.c Thu Mar 5 20:36:58 2009
> (r36362)
> @@ -463,7 +463,7 @@ svn_wc__text_modified_internal_p(svn_boo
> &tmp,
> SVN_WC__ENTRY_MODIFY_TEXT_TIME
> |
> SVN_WC__ENTRY_MODIFY_WORKING_SIZE,
> - pool));
> + TRUE, pool));
> }
>
> return SVN_NO_ERROR;
>
> Modified: trunk/subversion/libsvn_wc/relocate.c
> URL: http://svn.collab.net/viewvc/svn/trunk/subversion/libsvn_wc/relocate.c?pathrev=36362&r1=36361&r2=36362
> =
> =
> =
> =
> =
> =
> =
> =
> ======================================================================
> --- trunk/subversion/libsvn_wc/relocate.c Thu Mar 5 18:06:29 2009
> (r36361)
> +++ trunk/subversion/libsvn_wc/relocate.c Thu Mar 5 20:36:58 2009
> (r36362)
> @@ -45,6 +45,7 @@ relocate_entry(svn_wc_adm_access_t *adm_
> const char *to,
> svn_wc_relocation_validator3_t validator,
> void *validator_baton,
> + svn_boolean_t do_sync,
> apr_pool_t *pool)
> {
> svn_wc_entry_t entry2;
> @@ -105,7 +106,7 @@ relocate_entry(svn_wc_adm_access_t *adm_
>
> if (flags)
> SVN_ERR(svn_wc__entry_modify(adm_access, entry->name,
> - &entry2, flags, pool));
> + &entry2, flags, do_sync, pool));
> return SVN_NO_ERROR;
> }
>
> @@ -131,7 +132,8 @@ svn_wc_relocate3(const char *path,
> if (entry->kind == svn_node_file
> || entry->depth == svn_depth_exclude)
> return relocate_entry(adm_access, entry, from, to,
> - validator, validator_baton, pool);
> + validator, validator_baton, TRUE /* sync
> */,
> + pool);
>
> /* Relocate THIS_DIR first, in order to pre-validate the relocated
> URL
> of all of the other entries. This is technically cheating
> because
> @@ -141,7 +143,7 @@ svn_wc_relocate3(const char *path,
> SVN_ERR(svn_wc_entries_read(&entries, adm_access, TRUE, pool));
> entry = apr_hash_get(entries, SVN_WC_ENTRY_THIS_DIR,
> APR_HASH_KEY_STRING);
> SVN_ERR(relocate_entry(adm_access, entry, from, to,
> - validator, validator_baton, pool));
> + validator, validator_baton, FALSE, pool));
>
> subpool = svn_pool_create(pool);
>
> @@ -174,7 +176,7 @@ svn_wc_relocate3(const char *path,
> validator_baton, subpool));
> }
> SVN_ERR(relocate_entry(adm_access, entry, from, to,
> - validator, validator_baton, subpool));
> + validator, validator_baton, FALSE,
> subpool));
> }
>
> svn_pool_destroy(subpool);
>
> Modified: trunk/subversion/libsvn_wc/update_editor.c
> URL: http://svn.collab.net/viewvc/svn/trunk/subversion/libsvn_wc/update_editor.c?pathrev=36362&r1=36361&r2=36362
> =
> =
> =
> =
> =
> =
> =
> =
> ======================================================================
> --- trunk/subversion/libsvn_wc/update_editor.c Thu Mar 5 18:06:29
> 2009 (r36361)
> +++ trunk/subversion/libsvn_wc/update_editor.c Thu Mar 5 20:36:58
> 2009 (r36362)
> @@ -738,7 +738,7 @@ complete_directory(struct edit_baton *eb
> SVN_ERR(svn_wc__entry_modify(adm_access, current_entry-
> >name,
> &tmpentry,
>
> SVN_WC__ENTRY_MODIFY_DELETED,
> - subpool));
> + FALSE, subpool));
> }
> }
> /* An absent entry might have been reconfirmed as absent, and
> the way
> @@ -1277,6 +1277,7 @@ open_root(void *edit_baton,
> d->path, pool));
> SVN_ERR(svn_wc__entry_modify(adm_access, NULL /* THIS_DIR */,
> &tmp_entry, flags,
> + TRUE /* immediate write */,
> pool));
> }
>
> @@ -1810,7 +1811,8 @@ set_copied_callback(const char *path,
> tmp_entry.copied = TRUE;
> flags |= SVN_WC__ENTRY_MODIFY_COPIED;
> SVN_ERR(svn_wc__entry_modify(entry_adm_access, entry->name,
> - &tmp_entry, flags, pool));
> + &tmp_entry, flags, TRUE /*
> do_sync */,
> + pool));
> }
> }
> return SVN_NO_ERROR;
> @@ -1887,7 +1889,7 @@ schedule_existing_item_for_re_add(const
> SVN_ERR(svn_wc__entry_modify(entry_adm_access,
> (entry->kind == svn_node_dir)
> ? SVN_WC_ENTRY_THIS_DIR : base_name,
> - &tmp_entry, flags, pool));
> + &tmp_entry, flags, TRUE /* do_sync
> */, pool));
>
> /* If it's a directory, set the 'copied' flag recursively. The
> rest of the
> * directory tree's state can stay exactly as it was before being
> @@ -1917,7 +1919,7 @@ schedule_existing_item_for_re_add(const
> SVN_ERR(svn_wc__entry_versioned(&parent_entry, parent_path,
> parent_adm_access, TRUE, pool));
> SVN_ERR(svn_wc__entry_modify(parent_adm_access, base_name,
> - &tmp_entry, flags, pool));
> + &tmp_entry, flags, TRUE, pool));
>
> /* ### Need to do something more, such as change 'base' into
> 'revert-base'? */
> }
> @@ -2458,7 +2460,8 @@ add_directory(const char *path,
> }
>
> SVN_ERR(svn_wc__entry_modify(adm_access, db->name, &tmp_entry,
> - modify_flags, pool));
> + modify_flags,
> + TRUE /* immediate write */,
> pool));
>
> if (db->add_existed)
> {
> @@ -2482,7 +2485,8 @@ add_directory(const char *path,
> }
>
> SVN_ERR(svn_wc__entry_modify(adm_access, NULL, &tmp_entry,
> - modify_flags, pool));
> + modify_flags,
> + TRUE /* immediate write */,
> pool));
> }
> }
>
> @@ -2508,13 +2512,15 @@ add_directory(const char *path,
> SVN_ERR(svn_wc_adm_retrieve(&adm_access, eb->adm_access,
> pb->path, db->pool));
> SVN_ERR(svn_wc__entry_modify(adm_access, db->name, &tmp_entry,
> - modify_flags, pool));
> + modify_flags,
> + TRUE /* immediate write */,
> pool));
>
> /* Mark PATH's 'this dir' entry as scheduled for deletion. */
> SVN_ERR(svn_wc_adm_retrieve(&adm_access, eb->adm_access,
> db->path, db->pool));
> SVN_ERR(svn_wc__entry_modify(adm_access, NULL /* This Dir
> entry */,
> - &tmp_entry, modify_flags, pool));
> + &tmp_entry, modify_flags,
> + TRUE /* immediate write */,
> pool));
> }
>
> /* If this add was obstructed by dir scheduled for addition without
> @@ -2665,7 +2671,9 @@ open_directory(const char *path,
> tmp_entry.incomplete = TRUE;
>
> return svn_wc__entry_modify(adm_access, NULL /* THIS_DIR */,
> - &tmp_entry, flags, pool);
> + &tmp_entry, flags,
> + TRUE /* immediate write */,
> + pool);
> }
>
>
> @@ -2967,7 +2975,7 @@ absent_file_or_dir(const char *path,
> SVN_WC__ENTRY_MODIFY_REVISION |
> SVN_WC__ENTRY_MODIFY_DELETED |
> SVN_WC__ENTRY_MODIFY_ABSENT),
> - pool);
> + TRUE /* immediate write */, pool);
> }
>
> ------------------------------------------------------
> http://subversion.tigris.org/ds/viewMessage.do?dsForumId=495&dsMessageId=1275389

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=1275432
Received on 2009-03-06 05:53:40 CET

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.