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 #439
Date Thu, 04 Mar 2010 16:24:04 GMT
See <http://hudson.zones.apache.org/hudson/job/subversion-trunk-ubuntu/439/changes>

Changes:

[julianfoad] * subversion/libsvn_wc/update_editor.c
  (close_file): Add Bert's response to a question I posed in r919037.

[julianfoad] Tidy the new pristine-text writing code (still guarded by SVN_EXPERIMENTAL).

* subversion/libsvn_wc/update_editor.c
  (handler_baton, file_baton): Move the new pristine-path members to be
    just after the corresponding WC-1 members.
  (window_handler, add_file_with_history): Move the new pristine-path code
    to be just after the corresponding WC-1 code.
  (get_pristine_tee_stream): Add a doc string.
  (apply_textdelta, close_file): Tweak comments.

[rhuijben] Following up on r919021, commit a few docstrings I forgot to save before
committing.

* subversion/libsvn_client/cleanup.c
  (global): Reinsert page feed I accidentally removed in r919021.
  (repos_info_baton,
   fetch_repos_info): Add docstrings.

[rhuijben] Add support for upgrading Subversion 1.0.0 working copies by adding a
retrieve repository information callback to svn_wc_upgraded().

The Subversion 1.0.0 client format didn't record a repository
root in the working copy so we have to fall back on retrieving this
information via the ra layer. For modern working copies (read: 1.5 and
later) we should never have to fall back on this callback, but when
such a working copy was created by upgrading from a previous version
we might have to do it anyway.

* subversion/include/svn_wc.h
  (svn_wc_upgrade_get_repos_info_t): New typedef.
  (svn_wc_upgrade): Add callback.

* subversion/libsvn_client/cleanup.c
  (includes): Include svn_pools.h.
  (repos_info_baton): New struct.
  (fetch_repos_info): New function.
  (svn_client_upgrade): Pass fetcher to svn_wc_upgrade.

* subversion/libsvn_wc/upgrade.c
  (fetch_missing_entry_data): New function.
  (upgrade_to_wcng): Update prototype. Remove const from this_dir.
    Call fetch_missing_entry_data, before upgrading the entries.
  (upgrade_working_copy, svn_wc_upgrade): Pass callback to upgrade_to_wcng.

* subversion/tests/cmdline/upgrade_tests.py
  (run_and_verify_status_no_server): Fix error handling to show the real data.
  (xml_entries_relocate): New function.
  (basic_upgrade_1_0): Relocate the working copy using xml_entries_relocate,
    to make the url work for the upgrade callback. Also upgrade sub working
    copy (created by a failed svn cp replacement in 1.0.0), to make
    check_format() happy. Make expected_status match the working copy.
    Use 'svn info' to retrieve some properties that aren't checked by status.

[stsp] Rework how svn patch handles EOL styles.

* subversion/libsvn_client/patch.c
  (patch_target_t): Amend documentation of EOL_STYLE and EOL_STR fields.
   Declare them next to each other.
   They've changed their meanings slightly. The EOL_STR used to be the
   first newline character found in the target. Now it is either a fixed
   EOL character (in case the target has svn:eol-style set), or it is
   the EOL character which terminated the line most recently read from
   the target. EOL_STYLE is set to either 'none' (if no svn:eol-style is
   set), or it is set to the EOL-style specified by svn:eol-style.
  (init_patch_target): Initialise EOL_STYLE and EOL_STR according to the
   above. Also repair newlines of the target's eol-style is native (we
   used to repair newlines only if the style was fixed).
  (read_line): Put the EOL character which terminated the line into
   TARGET->EOL_STR if TARGET->EOL_STYLE is 'none'. Don't pass an EOL
   argument to svn_subst_translate_cstring2(), the string we're translating
   does not contain a newline.
  (match_hunk): Don't pass an EOL arguement to svn_subst_translate_cstring2(),
   same reason as above. Discard the newline read from the patch file, we do
   not need it during matching.
  (reject_hunk): Write the native EOL-character in the diff header of reject
   files.
  (apply_hunk): When writing out the patched result to a target which does
   not have an svn:eol-style property set, use the EOL character read from
   the patch for all lines copied from the patch (this includes context lines).
   In case the target has a different EOL-style and no svn:eol-style set,
   the target will end up with mixed EOLs. In this case users need to either
   change the newlines in the patch file, or set an svn:eol-style property
   on the target to get consistent EOLs in the patched result.
    
* subversion/tests/cmdline/patch_tests.py
  (patch_no_svn_eol_style, patch_with_svn_eol_style,
   patch_with_svn_eol_style_uncommitted): New regression tests which check
   for the behaviour around EOLs implemented as of this commit. Based on
   a patch submitted by dannas.
  (test_list): Add new tests.

[julianfoad] * subversion/libsvn_wc/adm_files.h
  (svn_wc__text_base_path, svn_wc__get_pristine_contents,
   svn_wc__get_revert_contents, svn_wc__text_revert_path): Clarify and fix
    doc strings.

------------------------------------------
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/include/svn_wc.h
U         subversion/libsvn_wc/update_editor.c
U         subversion/libsvn_wc/adm_files.h
U         subversion/libsvn_wc/upgrade.c
U         subversion/libsvn_client/patch.c
U         subversion/libsvn_client/cleanup.c
U         subversion/tests/cmdline/upgrade_tests.py
U         subversion/tests/cmdline/patch_tests.py
At revision 919049
[subversion-trunk-ubuntu] $ /bin/bash -xe /tmp/hudson1152797365072284837.sh
+ cd subversion-trunk
+ make distclean
make: *** No rule to make target `distclean'.  Stop.
Recording test results


Mime
View raw message