See 
<http://hudson.zones.apache.org/hudson/job/subversion-trunk-solaris/901/changes>

Changes:

[gstein] Return more work items from merge_file(), rather than performing a 
manual
queuing in the middle.

* subversion/libsvn_wc/update_editor.c:
  (merge_file): stop calling db_wq_add since we can now queue everything
    onto the returned *WORK_ITEMS.
  (svn_wc_add_repos_file4): remove a localvar that shadowed WORK_ITEM

[gstein] Add helper functions for paths that are persisted to disk. Saving an
abspath to disk prevents moving a working copy.

* subversion/libsvn_wc/wc_db.h:
* subversion/libsvn_wc/wc_db.c:
  (svn_wc__db_to_relpath, svn_wc__db_from_relpath): new functions

[gstein] Convert all the old loggy functions to build/return a work item rather
than directly install it into the queue. Adjust all callers to immediately
add the work item to the queue (future revisions may defer the install).

* subversion/libsvn_wc/log.h:
  (svn_wc__loggy_delete_entry, svn_wc__loggy_delete_lock,
     svn_wc__loggy_entry_modify, svn_wc__loggy_move,
     svn_wc__loggy_set_entry_timestamp_from_wc,
     svn_wc__loggy_set_entry_working_size_from_wc,
     svn_wc__loggy_set_timestamp): add a WORK_ITEM return parameter

* subversion/libsvn_wc/log.c:
  (svn_wc__loggy_delete_entry, svn_wc__loggy_delete_lock,
     svn_wc__loggy_entry_modify, svn_wc__loggy_move,
     svn_wc__loggy_set_entry_timestamp_from_wc,
     svn_wc__loggy_set_entry_working_size_from_wc,
     svn_wc__loggy_set_timestamp): add a WORK_ITEM return parameter.
   change call to wq_add_loggy into wq_build_loggy.

* subversion/libsvn_wc/workqueue.h:
  (svn_wc__wq_add_loggy): renamed to ...
  (svn_wc__wq_build_loggy): ... this. added a WORK_ITEM return param. note
    conditions on the allocation lifetime of the params.

* subversion/libsvn_wc/workqueue.c:
  (svn_wc__wq_add_loggy): renamed to ...
  (svn_wc__wq_build_loggy): ... this. added a WORK_ITEM return param.
    construct and return the work item.

* subversion/libsvn_wc/adm_ops.c:
  (process_committed_leaf): immediately add the work item returned by
    loggy_delete_lock to the workqueue.

* subversion/libsvn_wc/merge.c:
  (save_merge_result, preserve_pre_merge_files, merge_binary_file): add
    work items returned by loggy functions to the workqueue.

* subversion/libsvn_wc/props.c:
  (svn_wc__merge_props): add the loggy_entry_modify's returned work item
    to the workqueue.

* subversion/libsvn_wc/update_editor.c:
  (do_entry_deletion, add_directory, open_directory, add_file, open_file,
      merge_file, svn_wc_add_repos_file4):  add work items returned by
    loggy functions to the workqueue.

[gstein] Rename parameters on the svn_wc__loggy_* functions to note they must be
absolute paths. Assert this fact, and simplify loggy_path().

* subversion/libsvn_wc/log.h:
  (svn_wc__loggy_delete_entry, svn_wc__loggy_delete_lock,
      svn_wc__loggy_entry_modify, svn_wc__loggy_move,
      svn_wc__loggy_set_entry_timestamp_from_wc,
      svn_wc__loggy_set_entry_working_size_from_wc,
      svn_wc__loggy_set_timestamp): rename parameters to *_ABSPATH

* subversion/libsvn_wc/log.c:
  (loggy_path): for a NULL return, simply assert the equality of ABSPATH
    and ADM_ABSPATH. no need for a special error (we know it won't be
    thrown, and all this goes away soon).
  (svn_wc__loggy_delete_entry, svn_wc__loggy_delete_lock,
      svn_wc__loggy_entry_modify, svn_wc__loggy_move,
      svn_wc__loggy_set_entry_timestamp_from_wc,
      svn_wc__loggy_set_entry_working_size_from_wc,
      svn_wc__loggy_set_timestamp): rename parameters to *_ABSPATH. assert
    they are absolute. track rename in calls to loggy_path

------------------------------------------
Started by an SCM change
Building remotely on lucene.zones.apache.org (Solaris 10)
Updating https://svn.apache.org/repos/asf/subversion/trunk
U         subversion/libsvn_wc/props.c
U         subversion/libsvn_wc/adm_ops.c
U         subversion/libsvn_wc/update_editor.c
U         subversion/libsvn_wc/merge.c
U         subversion/libsvn_wc/wc_db.c
U         subversion/libsvn_wc/log.c
U         subversion/libsvn_wc/wc_db.h
U         subversion/libsvn_wc/log.h
U         subversion/libsvn_wc/workqueue.c
U         subversion/libsvn_wc/workqueue.h
At revision 942636
[subversion-trunk-solaris] $ /bin/bash -xe /var/tmp/hudson8165210181612709126.sh
+ cd subversion-trunk
+ 
PATH=/export/home/hudson/bin:/export/home/hudson/tools/java/latest/bin:/export/home/hudson/tools/ant/latest/bin:/export/home/hudson/tools/tomcat/latest/bin:/opt/subversion-current/bin:/usr/ucb:/usr/local/bin:/usr/bin:/usr/sfw/bin:/usr/sfw/sbin:/opt/sfw/bin:/opt/sfw/sbin:/opt/SUNWspro/bin:/usr/X/bin:/usr/ucb:/usr/sbin:/usr/ccs/bin:/usr/bin
+ export PATH
+ /usr/ccs/bin/make clean
make: Fatal error: Don't know how to make target `clean'
Recording test results

Reply via email to