[[[ crazycat ]]]
r33244 | lgo | 2008-09-22 21:49:07 +0000 (Mon 22 Sep 2008) |  6 lines
Changed Paths:
   M /trunk/subversion/svnsync/main.c

Fix issue #3219: add a line in the help text of 'svnsync init'  explaining the
new (since 1.5) possibility to sync only a part of a source repository.

* subversion/svnsync/main.c
  (svnsync_cmd_table): Add line about the source URL in 'initialize' section.

------------------------------------------------------------------------
r33244 | stsp | 2008-10-15 18:46:28 +0000 (Wed 15 Oct 2008) |  30 lines
Changed Paths:
    M /trunk/subversion/libsvn_subr/ssl_client_cert_pw_providers.c
    M /trunk/subversion/libsvn_subr/simple_providers.c
    M /trunk/subversion/libsvn_subr/auth.c
    M /trunk/subversion/include/svn_auth.h

Fix issue #3236, "plaintext-passwords assumes pools live across RA sessions".

Revert API requirements introduced on the
dont-save-plaintext-passwords-by-default branch in r30800.

* subversion/libsvn_subr/ssl_client_cert_pw_providers.c
  (svn_auth__ssl_client_cert_pw_file_save_creds_helper): Instead of
   expecting a scratch pool that survives across RA sessions, allocate
   memory for the user's answer in the same pool as the hash table which
   holds the answers.

* subversion/libsvn_subr/simple_providers.c
  (svn_auth__simple_save_creds_helper): As above.

* subversion/libsvn_subr/auth.c
  (svn_auth_save_credentials): Restore pre-r30800 behaviour: Pass a
   short-lived scratch pool, instead of a long-lived pool, to the
   save_credentials callback.

* subversion/include/svn_auth.h
  (svn_auth_provider_t): Remove pool lifetime requirement for
   save_credentials callback.
  (svn_auth_plaintext_prompt_func_t,
   svn_auth_plaintext_passphrase_prompt_func_t,
   svn_auth_save_credentials): Remove pool lifetime requirement.

Suggested by: gstein
(That is, he suggested how to fix this issue properly, thanks!)

------------------------------------------------------------------------
r32550 | kfogel | 2008-08-19 14:23:33 +0000 (Tue 19 Aug 2008) |  17 lines
Changed Paths:
    M /trunk/subversion/libsvn_subr/prompt.c
    M /trunk/subversion/include/svn_cmdline.h
    M /trunk/subversion/include/svn_auth.h

Fix issue #3239 - Use absolute, not relative, paths of the cert files
as keys in the client cert passphrase cache.

Patch by: stylesen

* subversion/libsvn_subr/prompt.c
  (svn_cmdline_auth_ssl_client_cert_prompt): Get the absolute path of cert
   file and set it in the credentials.

* subversion/include/svn_cmdline.h
  (svn_cmdline_auth_ssl_client_cert_prompt): Document that an absolute path
   of SSL client certificate filename will be recorded.

* subversion/include/svn_auth.h
  (svn_auth_cred_ssl_client_cert_t): In the documentation
   s/Full paths/Absolute path/

------------------------------------------------------------------------
r33085 | kfogel | 2008-09-15 21:35:55 +0000 (Mon 15 Sep 2008) |  40 lines
Changed Paths:
    M /trunk/subversion/mod_dav_svn/reports/log.c
    M /trunk/subversion/libsvn_ra_serf/log.c
    M /trunk/subversion/libsvn_ra_neon/log.c
    M /trunk/subversion/svn/cl.h
    M /trunk/subversion/svn/log-cmd.c
    M /trunk/subversion/svn/main.c
    M /trunk/notes/webdav-protocol
    M /trunk/subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout

Add new command line switch "--with-no-revprops" to the svn log CLI.
Extend the DAV protocol with a "no-revprops" flag, and update ra_serf
and ra_neon to send this flag if the revprops array is empty.  This
brings the DAV protocol on par with the SVN protocol, and exposes this
functionality to command line users.

Patch by: Eirik Bjorsnos <eirbjo {at} gmail.com>
(Only very minor tweaks by me, such as updating the getopt test data.)

* subversion/mod_dav_svn/reports/log.c
  (dav_svn__log_report): Read "no-revprops" and leave an empty array
    of rev-props to fetch.

* subversion/libsvn_ra_serf/log.c
  (svn_ra_serf__get_log): Add "<no-revprops/>" to log report request
    if revprops array is empty.

* subversion/libsvn_ra_neon/log.c
  (svn_ra_neon__get_log): Add "<no-revprops/>" to log report request
    if revprops array is empty.

* subversion/svn/cl.h
  (svn_cl__opt_state_t): Add no_revprops.  Fix existing comment, too.

* subversion/svn/log-cmd.c
  (svn_cl__log): Check for --with-no-revprops only being used in XML mode.
  (svn_cl__log): Create an empty revprops array if no_revprops is set.

* subversion/svn/main.c
  (svn_cl__longopt_t): Add opt_with_no_revprops.
  (svn_cl__options): Add "with-no-revprops" option.
  (svn_cl__cmd_table."log"): Add opt_with_no_revprops.
  (main): Check for opt_with_no_revprops being set.

* notes/webdav-protocol
  (log-report): Add "no-revprops" option.

* subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout: 
  Adjust for above.

------------------------------------------------------------------------
r33635 | stsp | 2008-10-14 14:18:19 +0000 (Tue 14 Oct 2008) |  18 lines
Changed Paths:
    M /trunk/subversion/svn/tree-conflicts.c

Fix issue #3297, "tree conflict data in entries not always printable".

When printing human-readable descriptions of tree conflicts, do not
make any assumptions about valid conflict scenarios. Rather, make
sure to return a usable string in every possible scenario.

* subversion/svn/tree-conflicts.c
  (tree_conflict_phrases): Add new members 'update_added', 'we_added',
   and 'unversioned'. 
  (new_tree_conflict_phrases): Initialise new tree_conflict_phrases members.
  (select_their_phrase): Handle previously unhandled action 'added' with
   update.
  (select_our_phrase): Handle previously unhandled reasons 'obstructed' with
   update, 'added' with update, and 'unversioned' with both update and merge.
   Also fix a bug -- we were returning the wrong string for the 'added'
   reason with merge.
  (svn_cl__append_tree_conflict_info_xml): Handle previously unhandled
   action 'added' and reason 'unversioned' with both update and merge.

------------------------------------------------------------------------
r35358 | cmpilato | 2009-01-20 22:25:54 +0000 (Tue 20 Jan 2009) |  12 lines
Changed Paths:
    M /trunk/contrib/client-side/svnmerge/svnmerge-migrate-history.py
    M /trunk/contrib/client-side/svnmerge/svnmerge-migrate-history-remotely.py

Finish issue #3302 (svnmerge.py migration tool(s) do not guarantee
proper svn:mergeinfo range ordering) by including a critical sort() of
revision-range-items-to-be.

* contrib/client-side/svnmerge/svnmerge-migrate-history.py
  (Migrator.get_natural_history): Sort the location segments before
    transforming them into mergeinfo revision ranges.

* contrib/client-side/svnmerge/svnmerge-migrate-history-remotely.py
  (SvnClient.get_history_as_mergeinfo): Sort the location segments before
    transforming them into mergeinfo revision ranges.

------------------------------------------------------------------------
r34166 | julianfoad | 2008-11-13 12:27:42 +0000 (Thu 13 Nov 2008) |  126 lines
Changed Paths:
   M  /trunk/
   M  /trunk/build.conf
   M  /trunk/notes/tree-conflicts/design-overview.txt
   M  /trunk/notes/tree-conflicts/requirements.txt
   M  /trunk/subversion/include/
   M  /trunk/subversion/include/private/svn_auth_private.h
   M  /trunk/subversion/include/private/svn_cache.h
   M  /trunk/subversion/include/svn_client.h 	modified , text changed
   M  /trunk/subversion/libsvn_auth_kwallet/kwallet.cpp
   M  /trunk/subversion/libsvn_client/resolved.c
   M  /trunk/subversion/libsvn_subr/
   M  /trunk/subversion/libsvn_wc/adm_ops.c
   M  /trunk/subversion/libsvn_wc/entries.c
   M  /trunk/subversion/libsvn_wc/tree_conflicts.c
   M  /trunk/subversion/libsvn_wc/tree_conflicts.h
   M  /trunk/subversion/libsvn_wc/wc.h
   M  /trunk/subversion/tests/cmdline/commit_tests.py
   M  /trunk/subversion/tests/cmdline/depth_tests.py
   M  /trunk/subversion/tests/cmdline/log_tests.py
   M  /trunk/subversion/tests/cmdline/tree_conflict_tests.py
   M  /trunk/subversion/tests/cmdline/tree_conflict_tests.txt
   M  /trunk/subversion/tests/libsvn_subr/ 
   M  /trunk/tools/buildbot/slaves/win32-xp-VS2005/
   M  /trunk/tools/server-side/svn_server_log_parse.py
   M  /trunk/tools/server-side/test_svn_server_log_parse.py
   M  /trunk/www/development.html
   M  /trunk/www/issue-tracker.html
   M  /trunk/www/tasks.html

Merge the "tc-resolve" branch to trunk. This makes "resolved" handle tree
conflicts per victim rather than per parent.

Below are all the pertinent parts of log messages on the branch, partially
edited for grouping and to remove some irrelevant details of intermediate
steps.

------------------------------------------------------------------------

* subversion/libsvn_wc/adm_ops.c
  (resolve_conflict_on_entry): Do not clear tree conflicts that are recorded
    in this entry. Do not send a notification, but instead report (through a
    new boolean output parameter) whether something was resolved.
  (resolve_found_entry_callback): Resolve any tree conflict for this victim.
    Send a notification if any conflict was resolved.
  (svn_wc_resolved_conflict4): Use an entries-walker function that visits
    unversioned tree conflict victims as well as ordinary entries.

------------------------------------------------------------------------

Allow sched-deleted nodes to be resolved (fixes update_tests.py 15).

* subversion/libsvn_wc/adm_ops.c
  (resolve_found_entry_callback):
    Allow sched-deleted nodes to be resolved.

* subversion/libsvn_wc/entries.c
  (visit_tc_too_found_entry):
    Only try to retrieve the ADM_ACCESS in presence of tree-conflicts.
  (visit_tc_too_error_handler):
    Get the ADM_ACCESS on the parent instead of on the node itself, thus
    avoid an error upon an unversioned tree-conflict victim.
    ### TODO: check for greater subdir depths.

Fix a crash in del_tree_conflict().

* subversion/libsvn_wc/tree_conflicts.c
  (svn_wc__del_tree_conflict):
    Only write and run the log if LOG_ACCUM is not NULL.

------------------------------------------------------------------------

Fix per-victim "resolved" on directory tree-conflict victims.

* subversion/libsvn_client/resolved.c
  (svn_client_resolve):
    Get the ADM_ACCESS on the target's parent directory to be able to resolve
    tree-conflicted directories. Extend the ADM_LOCK_LEVEL to still be able
    to lock the target node for text/prop conflicts.

* subversion/include/svn_client.h
  (svn_client_resolve): Comment.

* subversion/libsvn_wc/adm_ops.c
  (resolve_found_entry_callback):
    Completely split tree-conflict resolution from text and prop conflicts,
    because tree-conflicts need a different ADM_ACCESS when handling
    directories. Change use of RESOLVED to already reflect the sanity-check,
    and sanity-check separately for tree-conflicts. Clarify some conditions.
    Also remove the debugging conditions that exited prematurely.

* subversion/libsvn_wc/tree_conflicts.c
  (svn_wc__loggy_del_tree_conflict):
    Extend an assertion by a NULL check. Add another assertion to make sure
    the VICTIM_PATH is a child node of the ADM_ACCESS' path.

* subversion/libsvn_wc/tree_conflicts.h
  (svn_wc__loggy_add_tree_conflict,
   svn_wc__loggy_del_tree_conflict,
   svn_wc__del_tree_conflict,
   svn_wc__write_tree_conflicts_to_entry,
   svn_wc__tree_conflict_exists):
    Comments, add "@since New in 1.6.".

------------------------------------------------------------------------

Make the tree-conflict-enabled WC walker cope with an unversioned target.

* subversion/libsvn_wc/entries.c,
  subversion/libsvn_wc/wc.h
  (svn_wc__walk_entries_and_tc): Allow the target to be unversioned, and
    allow adm_access to be null.

------------------------------------------------------------------------

Fix the behaviour of "resolved" that descends into unversioned
tree-conflicts even if the depth doesn't allow that.

* subversion/libsvn_wc/entries.c
  (visit_tc_too_baton_t): Add TARGET and DEPTH fields.
  (visit_tc_too_found_entry):
    Use new TARGET and DEPTH fields in the baton to determine whether to
    descend into unversioned tree-conflicted children of a directory.
  (svn_wc__walk_entries_and_tc): Supply TARGET and DEPTH to the baton.

------------------------------------------------------------------------

Tests.

* subversion/tests/cmdline/commit_tests.py
  (tree_conflicts_resolved): Adjust for resolving per victim.

* subversion/tests/cmdline/depth_tests.py
  (tree_conflicts_resolved_depth_empty, tree_conflicts_resolved_depth_files,
   tree_conflicts_resolved_depth_immediates,
   tree_conflicts_resolved_depth_infinity, make_depth_tree_conflicts):
    Four new tests and a helper. The tests are XFAIL because the helper
    make_depth_tree_conflicts() exposes an error in update code that
    is not related to "resolved". Separate trials suggest that these
    tests will pass as soon as the update issue is resolved. See
    inline comment in make_depth_tree_conflicts() marked "##".
  (test_list): Add the new tests.

* subversion/tests/cmdline/log_tests.py
  (merge_history_repos): Resolve the victim, not the parent.

* subversion/tests/cmdline/tree_conflict_tests.py
  (ensure_tree_conflict): Resolve the victim, not the parent.
    Make a "resolved" test also try run "resolved" on the victim's
    parent first, to make sure it doesn't resolve its children.
    Remove comment about not supporting "resolved" per victim.

* subversion/tests/cmdline/update_tests.py
  (another_hudson_problem): Resolve the victim, not the parent.

------------------------------------------------------------------------
r34106 | danielsh | 2008-11-07 22:28:47 +0000 (Fri 7 Nov 2008) |  8 lines
Changed Paths:
   M /trunk/subversion/libsvn_repos/fs-wrap.c

Fix issue #3313 by validating all eligible properties (and among them,
svn:author) for being valid UTF-8.

* subversion/libsvn_repos/fs-wrap.c
  (validate_prop):
    Apply the "is UTF-8 and LF" check whenever svn_prop_needs_translation()
    is true (that is the very definition of the latter).

------------------------------------------------------------------------
r34247 | neels | 2008-11-18 06:13:52 +0000 (Tue 18 Nov 2008) |  21 lines
Changed Paths:
   M /trunk/subversion/libsvn_client/commit_util.c
   M /trunk/subversion/libsvn_wc/tree_conflicts.h,
   M /trunk/subversion/include/private/svn_wc_private.h
   M /trunk/subversion/tests/libsvn_wc/tree-conflict-data-test.c:

Fix (probably most of) issue #3320: Commit fails to block on tree-conflict.

* subversion/libsvn_client/commit_util.c
  (harvest_committables):
    Already check for tree-conflicts on immediate child nodes when harvesting
    a directory, adhering to the requested DEPTH. Thus catch tree-conflicts
    on nodes that don't have an entry (only when recursing; when the target
    is a victim and has no entry, "commit" still gives a different error).
  (do_item_commit): Fix typo in comment.

* subversion/libsvn_wc/tree_conflicts.h,
* subversion/include/private/svn_wc_private.h
  (svn_wc__read_tree_conflicts_from_entry): 
    Move declaration of this function to svn_wc_private.h, so that it
    is visible in commit_util.c (s.a.).
    Also clarify the function's comment.

* subversion/tests/libsvn_wc/tree-conflict-data-test.c:
    Also include svn_wc_private.h,
    for svn_wc__read_tree_conflicts_from_entry().

------------------------------------------------------------------------
r34266 | neels | 2008-11-19 05:39:14 +0000 (Wed 19 Nov 2008) | 20 lines
Changed Paths:
   M /trunk/subversion/libsvn_client/commit_util.c

Follow-up on r34247: issue #3320: Commit fails to block on tree-conflict.

Fix handling of changelists in r34247, compare against child entry instead
of parent entry. Also, when using changelists, silently skip tree-conflict
victims that have no entry.

Note: There is no way of assigning a tree-conflict victim that has no entry
to a changelist.

Move the checking of tree-conflicted children out into another function
for code readability.

* subversion/libsvn_client/commit_util.c
  (bail_on_tree_conflicted_children):
    New function contains the error detection on tree-conflicted child nodes.
    Handle changelists properly (s.a.).
  (harvest_committables): 
    Move checking of tree-conflicted children to
    new function bail_on_tree_conflicted_children().

------------------------------------------------------------------------
r34267 | neels | 2008-11-19 05:46:14 +0000 (Wed 19 Nov 2008) | 8 lines
Changed Paths:
   M /trunk/subversion/libsvn_client/commit_util.c

Another follow-up on r34247: issue #3320: Commit fails to block on tree-
conflict.

* subversion/libsvn_client/commit_util.c
  (svn_client__harvest_committables): 
    Issue a correct tree-conflict error when the *target* is a tree-conflict
    victim without an entry, instead of saying "not under version control".

------------------------------------------------------------------------
r34176 | julianfoad | 2008-11-13 15:33:55 +0000 (Thu 13 Nov 2008) | 38 lines
Changed Paths:
   M /trunk/subversion/include/private/svn_wc_private.h
   M /trunk/subversion/include/svn_wc.h
   M /trunk/subversion/libsvn_client/info.c
   M /trunk/subversion/libsvn_client/merge.c
   M /trunk/subversion/libsvn_wc/adm_ops.c
   M /trunk/subversion/libsvn_wc/entries.c
   M /trunk/subversion/libsvn_wc/questions.c
   M /trunk/subversion/libsvn_wc/status.c
   M /trunk/subversion/libsvn_wc/tree_conflicts.c
   M /trunk/subversion/libsvn_wc/tree_conflicts.h

Make the tree-conflict WC APIs private to Subversion (but shared across
libraries). Previously, two were public and the third was private to
libsvn_wc. This is issue #3321.

* subversion/include/private/svn_wc_private.h
  (svn_wc__get_tree_conflict, svn_wc__add_tree_conflict): New, moved from
    svn_wc_get_tree_conflict and svn_wc_add_tree_conflict respectively in
    svn_wc.h.
  (svn_wc__del_tree_conflict): Moved from tree_conflicts.h.

* subversion/include/svn_wc.h
  (svn_wc_get_tree_conflict, svn_wc_add_tree_conflict): Rename and move
    to svn_wc_private.h.

* subversion/libsvn_client/info.c
  (info_found_entry_callback, info_error_handler): Adjust calls.

* subversion/libsvn_client/merge.c
  (tree_conflict): Adjust calls.

* subversion/libsvn_wc/adm_ops.c
  (revert_internal, resolve_found_entry_callback): Adjust calls.

* subversion/libsvn_wc/entries.c
  (visit_tc_too_error_handler, svn_wc__walk_entries_and_tc): Adjust calls.

* subversion/libsvn_wc/questions.c
  (svn_wc_conflicted_p2): Adjust calls.

* subversion/libsvn_wc/status.c
  (get_dir_status): Adjust calls.

* subversion/libsvn_wc/tree_conflicts.c
  (svn_wc_add_tree_conflict, svn_wc_get_tree_conflict): Rename to
    svn_wc__add_tree_conflict and svn_wc__get_tree_conflict respectively.

* subversion/libsvn_wc/tree_conflicts.h
  (svn_wc__del_tree_conflict): Rename and move to svn_wc_private.h.

------------------------------------------------------------------------
r34436 | julianfoad | 2008-11-26 18:43:09 +0000 (Wed 26 Nov 2008) | 8 lines
Changed Paths:
   M /trunk/subversion/libsvn_client/merge.c

Fix the tree conflict URL information stored by a merge: the URLs of the root
of the merge were stored instead of the URLs of the conflict victim.

Found by: neels

* subversion/libsvn_client/merge.c
  (tree_conflict): Construct and store the source URLs of the victim.

------------------------------------------------------------------------
r34345 | sbutler | 2008-11-22 23:46:26 +0000 (Sat 22 Nov 2008) | 34 lines
Changed Paths:
   M /trunk/subversion/libsvn_wc/log.c
   M /trunk/subversion/libsvn_wc/tree_conflicts.c
   M /trunk/subversion/tests/cmdline/depth_tests.py

Properly loggify the recording of tree conflict data during update and
switch.  The desired end result is the same as before; only the timing
of the entry-writing has changed.  It's now consistent with the other
loggy commands.

* subversion/libsvn_wc/tree_conflicts.c
  (svn_wc__loggy_add_tree_conflict): Move to log.c, where the other
   svn_wc__loggy_* functions are.

* subversion/libsvn_wc/log.c
  (#include tree_conflicts.h): We need tree conflict helper functions.
  (svn_wc__loggy_add_tree_conflict): Move here from tree_conflicts.
   Change this function to simply write an <add-tree-conflict> log
   element in the victim's parent's log.
  (SVN_WC__LOG_ADD_TREE_CONFLICT,
   SVN_WC__LOG_ATTR_DATA): New XML element and attribute names.
  (log_runner): Add fields tree_conflicts_added (boolean) and
   tree_conflicts (array).  Add field result_pool to hold the tree
   conflicts.
  (log_do_add_tree_conflict): Sanity check a new tree conflict and
   add it to loggy->tree_conflicts.
  (start_handler): Support <add-tree-conflict> log elements.
  (run_log_from_memory): Note: no tree conflict support needed because
   this function doesn't update the entry.
  (run_log): If the log_runner has tree conflicts, encode them as text
   data and include them in the entry rewrite.

* subversion/tests/cmdline/depth_tests.py
  (make_depth_tree_conflicts): Correct errors in expected status.
  (verify_lines): New function borrowed from merge tests.
  (tree_conflicts_resolved_depth_immediates,
   tree_conflicts_resolved_depth_infinity): Allow expected output in
   any order.

------------------------------------------------------------------------
r35815 | pburba | 2009-02-11 19:05:26 +0000 (Wed 11 Feb 2009) | 9 lines
Changed Paths:
   M /trunk/subversion/tests/cmdline/update_tests.py
	
Tweak an issue #3334 update test to demonstrate one last (?) bug.

See http://subversion.tigris.org/issues/show_bug.cgi?id=3334#desc6.

* subversion/tests/cmdline/update_tests.py
  (tree_conflict_uc1_update_deleted_tree): Include an added directory
  and child file among the incoming edits within a locally deleted tree.
  (test_list): Mark tree_conflict_uc1_update_deleted_tree as XFail.

------------------------------------------------------------------------
r35817 | pburba | 2009-02-11 20:13:44 +0000 (Wed 11 Feb 2009) | 13 lines
Changed Paths:
   M /trunk/subversion/libsvn_wc/update_editor.c
   M /trunk/subversion/tests/cmdline/update_tests.py

Fix an outstanding issue #3334 bug.

See http://subversion.tigris.org/issues/show_bug.cgi?id=3334#desc6.

* subversion/libsvn_wc/update_editor.c
  (add_directory): If adding a directory within a tree schedule for
  deletion then don't exit early, mark added dir as scheduled for
  deletion in its own and its parent's entries, and suppress addition
  notification.

* subversion/tests/cmdline/update_tests.py
  (test_list): Remove XFail from tree_conflict_uc1_update_deleted_tree.

------------------------------------------------------------------------
r35036 | gstein | 2009-01-06 11:00:30 +0000 (Tue 6 Jan 2009) | 40 lines
Changed Paths:
   M /trunk/subversion/libsvn_wc/log.c
   M /trunk/subversion/libsvn_wc/tree_conflicts.c
   M /trunk/subversion/libsvn_wc/tree_conflicts.h
   M /trunk/subversion/tests/libsvn_wc/tree-conflict-data-test.c
	
Switch tree conflict storage over to skels, rather than a custom format.
Solves issue #3343.

Review and additional work by: hwright

* subversion/libsvn_wc/tree_conflicts.h:
  (svn_wc__write_tree_conflicts): constify a parameter

* subversion/libsvn_wc/tree_conflicts.c:
  (field_separator, desc_separator, escape_char, read_field_separator,
     read_desc_separator, read_string_field, write_string_field,
     write_integer_field): removed
  (is_valid_version_info_skel, is_valid_conflict_skel): new
  (read_enum_field): read the field from a skel, rather than a character
    start/end position. the pool param is no longer required.
  (read_node_version_info, read_one_tree_conflict): read from a skel
    instead of a string. split the single pool param into both scratch and
    result pools.
  (svn_wc__read_tree_conflicts): parse the input into a skel, and then
    walk that to construct the tree conflict structures.
  (write_enum_field): renamed to ...
  (skel_prepend_enum): ... this. prepend the mapped value to a given skel.
  (prepend_version_info_skel): build a skel for the version info, and
    prepend it to the provided skel.
  (svn_wc__write_tree_conflicts): constify a parameter, and switch to
    skel-based preparation.
  (svn_wc__loggy_del_tree_conflict): remove temp variable, writing the
    conflict data result directly into the entry (save a strdup).

* subversion/libsvn_wc/log.c:
  (run_log): remove temp variable, writing directly into the entry
    structure, saving a strdup.
  (svn_wc__loggy_add_tree_conflict): constify temp variable.

* subversion/tests/libsvn_wc/tree-conflict-data-test.c:
  (test_read_tree_conflict, test_read_2_tree_conflicts): change the
    expected string representation of the tree conflicts.
  (test_write_tree_conflict, test_write_2_tree_conflicts): constify a
    param and change the expected string rep of the conflict.
  (test_write_invalid_tree_conflicts): constify a variable.

------------------------------------------------------------------------
r35263 | hwright | 2009-01-15 17:12:23 +0000 (Thu 15 Jan 2009) | 43 lines
Changed Paths:
   M /trunk/Makefile.in 	modified , text changed
   A /trunk/build/ac-macros/sqlite.m4 (from trunk/build/ac-macros/sqlite.m4)
   M  /trunk/build/getversion.py
   M  /trunk/build.conf
   M  /trunk/configure.ac
   M  /trunk/subversion/libsvn_subr/
   M  /trunk/subversion/libsvn_subr/sqlite.c
   D  /trunk/subversion/libsvn_subr/sqlite3_c.h
	
Make configure a bit more flexible when is comes to SQLite:
 * When given the --with-sqlite flag:
    - check that the target is a sqlite installation that exists and meets
      our minimum requirements
    - check that the target is the sqlite amalgamation that exists and meets
      our minimum requirements

 * When not given the --with-sqlite flag:
    - check for the shared library via pkg-config
    - check for an appropriate amalgamation file in build/

INSTALL still needs to be updated, as does the code for including the
amalgamation file in -deps.  Those commits will follow shortly.

This commit also reverts portions of r35241, which added initial support
for the amalgamation file (to the detriment of library installs).

* Makefile.in, build.conf:
  Revert r35241.

* subversion/libsvn_subr/sqlite.c:
  Conditionally include the amalgamation.

* subversion/libsvn_subr/sqlite3_c.h:
  Remove.

* build/ac-macros/sqlite.m4
  (SVN_LIB_SQLITE): Update config order as described above, and refactor to make
    slightly more readable.
  (SVN_SQLITE_PKG_CONFIG, SVN_SQLITE_DIR_CONFIG, SVN_SQLITE_FILE_CONFIG,
   SVN_SQLITE_VERNUM_PARSE): New.
  (SVN_DOWNLOAD_SQLITE): Update text.

* build/getversion.py
  (svn_extractor, sqlite_extractor, extractors): New.
  (usage_and_exit): Update.
  (): Allow this file to parse SQLite version information as well as svn
    version information.

* configure.ac
  Partially revert r35241, and use a minimum version in place of an accepted
  pattern for SQLite checking.

------------------------------------------------------------------------
r34897 | cmpilato | 2008-12-23 15:39:11 +0000 (Tue 23 Dec 2008) | 12 lines
Changed Paths:
   M /trunk/subversion/libsvn_fs_base/tree.c
   M /trunk/subversion/tests/libsvn_fs_base/fs-base-test.c
	
Fix issue #3349 (BDB backend could allow `changes' table out-of-sync
with actual changes).

* subversion/libsvn_fs_base/tree.c
  (txn_body_txdelta_finalize_edits): Add the `changes' table item here...
  (txn_body_apply_textdelta): ...instead of here.
  (txn_body_fulltext_finalize_edits): And do the same here...
  (txn_body_apply_text): ...instead of here.

* subversion/tests/libsvn_fs_base/fs-base-test.c
  (test_funcs): Expect 'orphaned_textmod_change' test to pass now.

------------------------------------------------------------------------
r35303 | stsp | 2009-01-17 13:43:26 +0000 (Sat 17 Jan 2009) | 14 lines
Changed Paths:
   M /trunk/subversion/libsvn_wc/merge.c

Fix issue #3354, update fails when file with local mods is
                 moved and modified

Note: This commit just fixes the problem, but does not
touch the regression test for this issue (update_test 52).
The test still needs work.

* subversion/libsvn_wc/merge.c
  (maybe_resolve_conflicts): Add copyfrom_text argument.
  (eval_conflict_func_result): As above, and also copy
   the copyfrom text into the working copy in case the user
   postpones conflict resolution.
  (merge_text_file): Track argument changes.

------------------------------------------------------------------------
r35322 | pburba | 2009-01-19 16:11:38 +0000 (Mon 19 Jan 2009) | 8 lines
Changed Paths:
   M /trunk/subversion/tests/cmdline/update_tests.py

Correct expectations for issue #3354 test.

* subversion/tests/cmdline/update_tests.py
  (update_moves_and_modifies_an_edited_file): Add some newlines to text
  edits to make text conflicts clearer.  Expect an update which moves a
  locally edited to file to result in a text conflict on the move
  destination and a tree conflict on the move source.

------------------------------------------------------------------------
r35390 | pburba | 2009-01-22 18:02:47 +0000 (Thu 22 Jan 2009) | 11 lines
Changed Paths:
   M /trunk/subversion/libsvn_wc/merge.c
   M /trunk/subversion/tests/cmdline/update_tests.py

Fix issue #3354 when there is no interactive conflict resolution.

* subversion/libsvn_wc/merge.c
 (maybe_resolve_conflicts): Consider no interactive conflict resolution
 as analogous to postponing conflict resolution.

* subversion/tests/cmdline/update_tests.py
 (test_list): Remove XFail from update_moves_and_modifies_an_edited_file.

Review by: stsp

------------------------------------------------------------------------
r35199 | rhuijben | 2009-01-13 00:34:14 +0000 (Tue 13 Jan 2009) | 17 lines
Changed Paths:
   M /trunk/subversion/libsvn_client/log.c

Resolve issue #3356 by using the get_location_segments ra api to get the copy
source of a path. This makes the call much faster for 1.5+ repositories with
an node origin cache and the original implementation handles the log exactly
like the compatibility implementation of the ra api.
(So worst case this is duplicate code removal with an added check if
 get_location_segments is handled by the repository)

* subversion/libsvn_client/log.c
  (copyfrom_info_t): Add is_first boolean to find the second segment
    the easy way.
  (copyfrom_info_receiver): Implement svn_location_segment_receiver_t instead
    of svn_log_entry_receiver_t and replace all path calculation with a simple
    check to return the end of the second segment.
  (svn_client__get_copy_source): Call svn_ra_get_location_segments on
    copyfrom_info_receiver instead of svn_ra_get_log2 and remove unused
    calculations.

------------------------------------------------------------------------
r35501 | rhuijben | 2009-01-13 16:30:24 +0000 (Tue 27 Jan 2009) | 11 lines
Changed Paths:
   M /trunk/subversion/libsvn_client/client.h
   M /trunk/subversion/libsvn_client/mergeinfo.c
	
Following up on r35199, document that the path returned by 
svn_client__get_copy_source doesn't start with a'/' and update
its only caller that assumes it does.

* subversion/libsvn_client/client.h
  (svn_client__get_copy_source): Add note on not providing initial '/'.
* subversion/libsvn_client/mergeinfo.c
  (svn_client_suggest_merge_sources): Don't try to skip the '/'.
  
Found by: javahl tests

------------------------------------------------------------------------
r35554 | cmpilato | 2009-01-29 19:52:02 +0000 (Thu 29 Jan 2009) | 26 lines
Changed Paths:
   M /trunk/subversion/include/svn_client.h
   M /trunk/subversion/libsvn_client/copy.c
   M /trunk/subversion/libsvn_client/deprecated.c
   M /trunk/subversion/svn/copy-cmd.c
   M /trunk/subversion/svn/main.c
	
Finish issue #3365 - Support --ignore-externals option for "svn copy".

* subversion/include/svn_client.h
  (svn_client_copy5): New function.
  (svn_client_copy4): Deprecate, and rework docstring to describe
    delta against previous version.

* subversion/libsvn_client/deprecated.c
  (svn_client_copy4): Move here, and now just wrap svn_client_copy5().
  (svn_client_copy3): Update this to be a wrapper around svn_client_copy5().

* subversion/libsvn_client/copy.c
  (repos_to_wc_copy_single): Add 'ignore_externals' parameter, passed
    to svn_client__checkout_internal().
  (repos_to_wc_copy): Add 'ignore_externals' parameter, passed to
    repos_to_wc_copy_single().
  (try_copy): Add 'ignore_externals' parameter, passed to repos_to_wc_copy().
  (svn_client_copy5): New.  Like svn_client_copy4, but accepts
    'ignore_externals' parameter, which is passed to try_copy().

* subversion/svn/main.c
  (svn_cl__cmd_table): Add support for --ignore-externals to "copy".

* subversion/svn/copy-cmd.c
  (svn_cl__copy): Now call svn_client_copy5() instead of svn_client_copy4().

------------------------------------------------------------------------