subversion-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Apache Hudson Server <>
Subject Build failed in Hudson: subversion-trunk-ubuntu #442
Date Fri, 05 Mar 2010 14:37:35 GMT
See <>


[philip] Remove access batons from checkout/update/switch.

* subversion/include/private/svn_wc_private.h
  (svn_wc__acquire_write_lock, svn_wc__release_write_lock): Tweak doc strings.

* subversion/libsvn_wc/lock.c
  (svn_wc__acquire_write_lock): More complete anchor calculation.
  (svn_wc__release_write_lock): Don't remove lock if work queue item exists.

* subversion/libsvn_wc/update_editor.c
  (struct edit_baton): Remove adm_access, add close_edit_complete.
  (cleanup_dir_baton): Remove locks if not close_edit_complete.
  (prep_directory): Acquire lock rather than access baton.
  (schedule_existing_item_for_re_add): Remove comment, locks are recursive.
  (close_directory): Kill cleanup handler.
  (merge_file): Adjust file external checks for possible entry cache bug.
  (close_edit): Set close_edit_complete.
  (make_editor): Remove access batons.

* subversion/libsvn_wc/log.c
  (log_do_delete_entry): Remove call to extend access baton.

* subversion/libsvn_client/deprecated.c
  (svn_client_switch): Don't pass NULL for access baton.

* subversion/libsvn_client/client.h
  (svn_client__switch_internal, svn_client__handle_externals): Remove
   adm_access parameter.

* subversion/libsvn_client/switch.c
  (switch_internal): New, copied from svn_client__switch_internal.  Add
   local_abspath and anchor_abspath parameters, remove access baton code.
  (svn_client__switch_internal): Gutted. Remove adm_access parameter. Now
   just a wrapper to acquire and release locks.
  (svn_client_switch2): Don't pass NULL for access baton.

* subversion/libsvn_client/update.c
  (update_internal): New, copied from svn_client__update_internal.  Add
   local_abspath and anchor_abspath parameters, remove access baton code.
  (svn_client__update_internal): Gutted. Now just a wrapper to acquire
   and release locks.

* subversion/libsvn_client/externals.c
  (struct handle_external_item_change_baton): Remove adm_access.
  (switch_dir_external): Don't pass NULL for access baton.
  (switch_file_external): Remove adm_access parameter. Remove access batons,
   acquire lock instead.  Avoid SVN_ERR and goto cleanup instead.
  (handle_external_item_change): Don't pass access baton.
  (struct handle_externals_desc_change_baton): Remove adm_access.
  (handle_externals_desc_change): Remove access baton code.
  (svn_client__handle_externals): Remove adm_access parameter.
* subversion/tests/cmdline/
  (test_list): Remove XFail from update_1_5.

[julianfoad] Unify the writing of new WC-1 text-base files in three different places in

* subversion/libsvn_wc/adm_files.h,
  (svn_wc__open_writable_base): Change from creating the temporary file at
    a special path (that depended on whether it was a revert-base) to
    creating it with an arbitrary name in the temporary files directory.

* subversion/libsvn_wc/update_editor.c
  (add_file_with_history, svn_wc_add_repos_file4): Use
    svn_wc__open_writable_base() instead of the equivalent long-hand code.
  (apply_textdelta): Adjust by passing the 'db' instead of a 'revert' flag
    to svn_wc__open_writable_base().

[julianfoad] Revert part of my r919403: take the entry-modify statements out of the new
install_text_base() function and put them back in the two call sites.  The
first caller updates BASE_NODE and the second WORKING_NODE, so both will
need separate new code for directly using WC_DB to replace the entry

Suggested by: rhuijben

* subversion/libsvn_wc/update_editor.c
  (install_text_base): Remove the entry-modifying parts from here ...
  (merge_file, svn_wc_add_repos_file4): ... and put them back here.

[stsp] * subversion/libsvn_client/patch.c
  (check_local_mods): Remove. This helper isn't needed anymore since
   we don't check unversioned files for local modifications anymore.
  (init_patch_target): Call svn_wc_text_modified_p2() directly.

[julianfoad] Unify two places where a new text base file is installed.

* subversion/libsvn_wc/update_editor.c
  (install_text_base): New function.
  (merge_file, svn_wc_add_repos_file4): Use install_text_base() instead of
    equivalent long-hand code.
  (close_file): Tweak the comment about where the text base is installed.

Started by an SCM change
Building remotely on (Ubuntu)
U         subversion/include/private/svn_wc_private.h
U         subversion/libsvn_wc/adm_files.c
U         subversion/libsvn_wc/update_editor.c
U         subversion/libsvn_wc/lock.c
U         subversion/libsvn_wc/adm_files.h
U         subversion/libsvn_wc/log.c
U         subversion/libsvn_client/deprecated.c
U         subversion/libsvn_client/switch.c
U         subversion/libsvn_client/externals.c
U         subversion/libsvn_client/client.h
U         subversion/libsvn_client/patch.c
U         subversion/libsvn_client/update.c
U         subversion/tests/cmdline/
At revision 919429
[subversion-trunk-ubuntu] $ /bin/bash -xe /tmp/
+ cd subversion-trunk
+ make distclean
make: *** No rule to make target `distclean'.  Stop.
Recording test results

View raw message