On the merge-sensitive-log branch:
Add command line client output of merge sensitive log information. Update test,
and mark it as passing.
* subversion/svn/log-cmd.c
(log_receiver_baton): Add the merge_stack member.
(merge_frame): New structure.
(log_message_receiver): Check for nesting, and output extra "Result of merge"
line if the message of interested in a child of another message. Also,
check for children, and push state onto the merge stack if they exist.
(svn_cl__log): Initialize data structures.
* subversion/test/cmdline/log_tests.py
(check_merge_results): Check the results of the parse of the "Result of merge"
line with the expected value.
(simple_merge_sensitive_log): Update the exepected_merges value to match
the expected input to check_merge_results().
(test_list): Mark test simple_merge_sensitive_log() test as passing.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/merge-sensitive-log@865230 13f79535-47bb-0310-9956-ffa450edef68
2 files changed
