subversion-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Apache Hudson Server <hud...@hudson.zones.apache.org>
Subject Build failed in Hudson: subversion-trunk-ubuntu #431
Date Wed, 03 Mar 2010 17:07:51 GMT
See <http://hudson.zones.apache.org/hudson/job/subversion-trunk-ubuntu/431/changes>

Changes:

[rhuijben] Update the last change information (before WC-NG known as entry properties)
directly in WC-DB instead of via entry updates. This allows keeping track of
these values a bit longer than before, as the next entry_write() might remove
some details.

Like many similar updates this moves some loggy operations to using the database
directly, which might introduce some issues if you happen to press ^C in the
wrong place. The only solution that completely resolve this will be to update
BASE_NODE in one step, which is planned before 1.7.

This fixes one specific merge scenario that now properly detects that the
sub-replacement is done via the parent instead of directly. (The commit of
merge_tests#34 doesn't record a separate replacement now.)

* subversion/libsvn_wc/entries.c
  (fold_entry): Stop updating last_change information.

* subversion/libsvn_wc/entries.h
  (SVN_WC__ENTRY_MODIFY_CMT_REV,
   SVN_WC__ENTRY_MODIFY_CMT_DATE,
   SVN_WC__ENTRY_MODIFY_CMT_AUTHOR): Remove now unused values.

* subversion/libsvn_wc/log.c
  (log_do_modify_entry): Remove early WC-NG hack, which unset .deleted on
    updating last change information.

* subversion/libsvn_wc/old-and-busted.c
  (svn_wc__atts_to_entry): Remove uses of SVN_WC__ENTRY_MODIFY_CMT_AUTHOR.

* subversion/libsvn_wc/update_editor.c
  (last_change_info): New struct.
  (accumulate_entry_props): Rename to ...
  (accumulate_last_change): ... this and collect the information in
    a last_change_info struct instead of writing a loggy operations.
    Reorder arguments to match new standard.

  (close_directory): Collect last_change_info and if available write
    it to BASE_NODE in the final update step.

  (merge_props,
   merge_file): Collect last_change_info and pass to caller.
  (close_file): Collect last_chanhe_info and write it to BASE_NODE
    if available. Unset entry.deleted when we are adding a new node.

  (install_added_props): Collect last_change_info and pass it to caller.
  (svn_wc_add_repos_file4): If last_change info is provided write it to
    WORKING_NODE.

* subversion/libsvn_wc/wc-queries.sql
  (STMT_UPDATE_BASE_LAST_CHANGE,
   STMT_UPDATE_WORKING_LAST_CHANGE): New query.

* subversion/libsvn_wc/wc_db.c
  (svn_wc__db_temp_op_set_base_last_change,
   svn_wc__db_temp_op_set_working_last_change): New function.

* subversion/libsvn_wc/wc_db.h
  (svn_wc__db_temp_op_set_base_last_change,
   svn_wc__db_temp_op_set_working_last_change): New function.

[hwright] Simplify the creating of Sets in JavaHL.

* subversion/bindings/javahl/native/CreateJ.cpp
  (StringSet): Use the new helper function.
  (Set): New.

* subversion/bindings/javahl/native/SVNAdmin.cpp
  (lsLocks): Use the new helper function.

* subversion/bindings/javahl/native/CreateJ.h
  (Set): New.

[rhuijben] * subversion/libsvn_subr/opt.c
  (svn_opt_parse_path):
     Initialize a previously uninitialized struct member, to avoid an
     uninitialized variable warning/error a few lines later.

[stsp] Fix various bugs in file seeking and EOF handling in 'svn patch'.

* subversion/libsvn_client/patch.c
  (read_line): Don't increment the current line counter past EOF.
  (seek_to_line): Don't attempt to seek past EOF, fixing an endless loop.
   If the EOF indicator was set before seeking backwards, clear it.
  (match_hunk, scan_for_match, get_hunk_info): Don't clear EOF indicator,
   seek_to_line() does this now. And don't seek past EOF.
  (apply_hunk): If seeking past the hunk's original length fails,
   reject the hunk. Note that since the hunk was already matched
   successfully, this failure is unlikely.
   Add a ### comment about an unrelated bug discovered recently.

[rhuijben] * templates/vcnet_vcxproj.ezt
  Following up on the release of Visual Studio 2010 RC1, remove some
  explicit settings that are not needed any more because they are
  the default setting or are implied from the other settings. 
  Also add Utf-8 byte order mark and switch to ezt comment syntax.

------------------------------------------
Started by an SCM change
Started by an SCM change
Started by an SCM change
Building remotely on minerva.apache.org (Ubuntu)
Updating https://svn.apache.org/repos/asf/subversion/trunk
U         subversion/libsvn_wc/update_editor.c
U         subversion/libsvn_wc/wc-queries.sql
U         subversion/libsvn_wc/old-and-busted.c
U         subversion/libsvn_wc/entries.c
U         subversion/libsvn_wc/entries.h
U         subversion/libsvn_wc/wc_db.c
U         subversion/libsvn_wc/log.c
U         subversion/libsvn_wc/wc_db.h
U         subversion/libsvn_subr/opt.c
U         subversion/libsvn_client/patch.c
U         subversion/bindings/javahl/native/CreateJ.cpp
U         subversion/bindings/javahl/native/SVNAdmin.cpp
U         subversion/bindings/javahl/native/CreateJ.h
U         build/generator/templates/vcnet_vcxproj.ezt
At revision 918576
[subversion-trunk-ubuntu] $ /bin/bash -xe /tmp/hudson8052080554623667898.sh
+ cd subversion-trunk
+ make distclean
make: *** No rule to make target `distclean'.  Stop.
Recording test results


Mime
View raw message