Author: julianfoad
Date: Wed Jan 23 21:11:23 2013
New Revision: 1437736
URL: http://svn.apache.org/viewvc?rev=1437736&view=rev
Log:
* subversion/libsvn_client/merge.c
(merge_cmd_baton_t, conflict_resolver_baton_t): Tweak comments.
(conflict_resolver): Remove impossible conditions from a test.
Modified:
subversion/trunk/subversion/libsvn_client/merge.c
Modified: subversion/trunk/subversion/libsvn_client/merge.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/merge.c?rev=1437736&r1=1437735&r2=1437736&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/merge.c (original)
+++ subversion/trunk/subversion/libsvn_client/merge.c Wed Jan 23 21:11:23 2013
@@ -289,7 +289,9 @@ typedef struct merge_cmd_baton_t {
/* The list of any paths which remained in conflict after a
resolution attempt was made. We track this in-memory, rather
than just using WC entry state, since the latter doesn't help us
- when in dry_run mode. */
+ when in dry_run mode.
+ ### And because we only want to resolve conflicts that were
+ generated by this merge, not pre-existing ones? */
apr_hash_t *conflicted_paths;
/* A list of absolute paths which had no explicit mergeinfo prior to the
@@ -1489,12 +1491,12 @@ merge_dir_props_changed(svn_wc_notify_st
/* Contains any state collected while resolving conflicts. */
typedef struct conflict_resolver_baton_t
{
- /* The wrapped callback and baton. */
+ /* The wrapped callback and baton. If func is null, postpone conflicts. */
svn_wc_conflict_resolver_func2_t wrapped_func;
void *wrapped_baton;
/* The list of any paths which remained in conflict after a
- resolution attempt was made. */
+ resolution attempt was made. Non-null ptr to possibly-null ptr to hash. */
apr_hash_t **conflicted_paths;
/* Pool with a sufficient lifetime to be used for output members such as
@@ -1530,8 +1532,7 @@ conflict_resolver(svn_wc_conflict_result
}
/* Keep a record of paths still in conflict after the resolution attempt. */
- if ((! conflict_b->wrapped_func)
- || (*result && ((*result)->choice == svn_wc_conflict_choose_postpone)))
+ if ((*result)->choice == svn_wc_conflict_choose_postpone)
{
alloc_and_store_path(conflict_b->conflicted_paths,
description->local_abspath, conflict_b->pool);
