Checkout Tools
  • last updated 4 hours ago
Constraints: committers
Constraints: files
Constraints: dates

Changeset 868882 is being indexed.

Merge the fix-log-mergeinfo-tests branch to trunk.

This pythonifies the basic-merge.dump file, which should make keeping the

'log -g' tests current with trunk easier. This is also a step in fixing

'log -g' to work with mergeinfoless copies.

On the fix-log-mergeinfo-tests branch:

Bring up to date with trunk.

$ svn merge -r28734:28806 .

  1. … 53 more files in changeset.
On the fix-log-mergeinfo-tests branch:

Mark currently failing 'log -g' tests as XFail.

* subversion/tests/cmdline/

(test_list): Mark merge_sensitive_log_single_revision() and

merge_sensitive_log_non_branching_revision() as XFail.

* subversion/tests/cmdline/

(basic_reintegrate, reintegrate_branch_never_merged_to): Adjust

calls to run_and_verify_commit for r28802, as promised in r28803.

On the fix-log-mergeinfo-tests branch:

Update a couple of test expectations, as a result of implementing


* subversion/tests/cmdline/

(merge_sensitive_log_added_path): Update expected log messages.

Bring reintegrate branch up to date with trunk.

$ svn merge -r28777:28802 .

* subversion/tests/cmdline/ Resolve conflicts in the

obvious way. This file will require some further adjustments due

to r28802, but I will make those in a separate commit. [done in r28805]

  1. … 15 more files in changeset.
Make SVNTreeUnequal failures easier to trace in regression tests, by

adding a label to the tree (e.g., "output", "disk", "status", etc).

This change is not really as large as it looks: the bulk of it is just

fallout from removing some unused parameters to run_and_verify_commit,

which is really a separate change, but which is also intertwingled in

various ways with the label/singleton changes.

* subversion/tests/cmdline/svntest/

(compare_trees): Take a new label parameter, use it to construct the

compare_trees.display_nodes() inner function and the singleton

handlers and batons.

(default_singleton_handler): Replace default_singleton_handler_a and

default_singleton_handler_b with this one function, and depend on

the description parameter (formerly called baton) to distinguish

the two sides.

* subversion/tests/cmdline/svntest/

(setup_pristine_repository, run_and_verify_unquiet_status,

run_and_verify_status, run_and_verify_merge2, LogParser.extra_skip,

run_and_verify_export, run_and_verify_checkout,

run_and_verify_diff_summarize, verify_update): Pass new label

arguments to tree.compare_trees(), and fix some doc strings along

the way.

(run_and_verify_commit): Same, and remove the singleton handler

parameters, which were entirely unused.

(inject_conflict_into_wc): Update call to run_and_verify_commit.

* subversion/tests/cmdline/*: Adjust callers of run_and_verify_commit()

and compare_trees() for above changes.

  1. … 12 more files in changeset.
On the 'reintegrate' branch, make a minor docstring tweak.

* subversion/include/svn_fs.h

(svn_fs_get_mergeinfo_for_tree): In the docstring for this function,

add punctuation, and obey my kindergarten teacher's rules about

preposition positions.

Add .libs to svn:ignore.
Clarify 0wn-ership of task.
* subversion/tests/cmdline/ Remove some "PTB" debug cruft.

On the issue-2897 branch:

Fix faulty reflective merge file/directory deleted.

* subversion/libsvn_client/merge.c

(reflective_merge_file_deleted, reflective_merge_dir_deleted):

Fix the faulty implementation.

* subversion/tests/cmdline/

(test_list): Remove XFail marker from


On the issue-2897 branch:

Enhance merge_tests-77(merge_non_reflective_changes_from_reflective_rev) to

indicate the faulty reflective file/directory deletion callbacks.

* subversion/tests/cmdline/

(merge_non_reflective_changes_from_reflective_rev): Add tdir0 and tfile0.txt

in A/C prior to merge from A/FB1 and ensure reflective 'tfile0.txt' and

'tdir0' deletions don't delete the new deletions.

(test_list): Mark 'merge_non_reflective_changes_from_reflective_rev'

as XFail.

Found by: glasser

Remove a spurious newline in the 'svn mergeinfo' help text.

* subversion/svn/main.c

(svn_cl__options): Remove an extra newline at the end of the help text for


On the fix-log-mergeinfo-tests branch:

Teach the blame tests to use merge_history_repos() to setup interesting

repositories for testing 'blame -g'.

* subversion/tests/cmdline/

(blame_merge_info, blame_merge_out_of_range): Use merge_history_repos()

from to set up the test repository.

On the fix-log-mergeinfo-tests branch:

Finish implementing basic-merge.dump in Python.

* subversion/tests/cmdline/

(merge_history_repos): Fill in revisions 13-17, fixed revision 7.

Follow-up to r28791, mention the issue # this test is for.

* subversion/tests/cmdline/


New XFail test for issue #3067.

* subversion/tests/cmdline/

(new_subtrees_should_not_break_merge): New.

(test_list): Add new_subtrees_should_not_break_merge as XFail.

On the reintegrate branch: improve some error messages.

* subversion/svn/main.c

(main): Use clearer language, following up to r28788.

Suggested by: glasser

On the issue-2897 branch:

Account for the fact each *reflection* could be from different location

segment. Make merge_tests-81(reflective_merge_on_reincarnated_target) PASS.

* subversion/libsvn_client/mergeinfo.h

(svn_client__remaining_range_info_t): Add new member


(svn_client__get_commit_and_merge_ranges): API change to return

'merge_source_path_segments' as an OUT parameter.

* subversion/libsvn_client/mergeinfo.c

(svn_client__get_commit_and_merge_ranges): Implement as per new API.

* subversion/libsvn_client/merge.c

(merge_cmd_baton_t): Add new member 'reflected_target_segment_path'.

(summarize_reflected_ranges): Update doc string. Run summary on

appropriate target location segment.

(filter_reflective_revisions): Change the signature to cascade the new


(calculate_remaining_ranges): Fix call to 'filter_reflective_revisions' as

per new signature. Extract 'reflective location segment path' and store it

as appropriate in remaining_range item.

(drive_merge_report_editor): Indicate the 'reflected merge target path' for

reflective merges in the merge baton.

* subversion/tests/cmdline/

(test_list): Remove XFail marker from


On the reintegrate branch: check for mutually exclusive options.

* subversion/svn/main.c

(main): Error if --reintegrate is used with --ignore-ancestry or with


* reintegrate-branch-TODO: Remove relevant item.

On the issue-2897 branch:

Code format fix.

* subversion/libsvn_client/merge.c

(summarize_reflected_ranges): Code format fix.

Found by: dlr

On the issue-2897 branch:

Fix memory leak.

* subversion/libsvn_client/merge.c

(summarize_reflected_ranges): Destroy the 'iterpool'

Found by: dlr

On the issue-2897 branch:

Code refactor.

* subversion/libsvn_client/merge.c

(get_relative_path): New function.

(reflective_merge_file_changed, reflective_merge_file_added,

reflective_merge_dir_added, populate_remaining_ranges,

do_directory_merge): Drop redundant code and make use of


Suggested by: dlr

On the issue-2897 branch:

Comment fix and code readability improvements.

* subversion/libsvn_client/merge.c

(merge_cmd_baton_t): seperate by one new line between

'member declaration + doc' blocks to improve the readability.

(reflective_merge_file_added, reflective_merge_dir_added):

Improve the comment.

Suggested by: dlr

On the issue-2897 branch:

Remove extraneous space.

* subversion/libsvn_client/mergeinfo.h

(svn_client__remaining_range_info_t): Remove extraneous space in a comment.

Suggested by: dlr

In libsvn_fs_base on the 'reintegrate' branch, finish (I think) the

logic for maintaining the new has-mergeinfo and mergeinfo-count node

revision members.

(It's awfully conveniently that the BDB and FSFS implementations of

merge() are nearly identical.)

* subversion/libsvn_fs_base/tree.c

(merge): Add 'mergeinfo_increment_out' parameter, and populate it


(txn_body_merge): Update call to merge().

Put global options in a separate block in help output.

* subversion/libsvn_subr/opt.c

(print_command_info2): Put a "Global options:" heading above

global options. (Small change, but lots of reindentation.)

* subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout


Patch by: glasser

* subversion/tests/cmdline/

(basic_reintegrate, reintegrate_branch_never_merged_to): Adjust for

renames of r28775, which was merged from trunk in r28778.

Bring reintegrate branch up to date with trunk.

$ svn merge -r28721:28777 .

    • ?
    • ?
    • ?
    • ?
    • ?
  1. … 34 more files in changeset.