subversion

Checkout Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Delete the reintegrate-improvements branch, it was merged back to trunk.
On the reintegrate-improvements branch: Merge r34059-34089 from trunk.
    • ?
    /branches/reintegrate-improvements/subversion/po/zh_CN.po
  1. … 36 more files in changeset.
On the reintegrate-improvements branch: Merge r34024-34058 from trunk.
  1. … 19 more files in changeset.
On the reintegrate-improvements branch: Make reintegrate merges tolerate

subtree mergeinfo on the source as long as it indicates the same ranges were

previously merged from the target to the source across the entire source

tree.

* subversion/libsvn_client/merge.c

(remove_irrelevant_ranges): Provide a more thorough doc string. Handle as

hash of segment arrays for each subtree rather than a single array for the

root only.

(calculate_left_hand_side): Clear an old TODO(reint) and add a doc string.

Consider *all* the subtrees with mergeinfo in the target. If subtree

mergeinfo is thwarting reintegrate then provide a more detailed error

message spelling out which subtrees are the problem.

(subtree_mergeinfo_walk_baton): New baton for

get_subtree_mergeinfo_walk_cb.

(get_subtree_mergeinfo_walk_cb): New svn_wc_entry_callbacks2_t found_entry

callback.

(svn_client_merge_reintegrate): Walk the reintegrate target to find all

subtrees with explicit mergeinfo and pass that to

calculate_left_hand_side() as a hash.

* subversion/libsvn_subr/mergeinfo.c

(svn_mergeinfo_intersect): This API promises a deep copy, but did so only

for the rangelists, not the mergeinfo path keys.

* subversion/tests/cmdline/merge_tests.py

(reintegrate_with_subtree_mergeinfo): Expand this test to check that the

new and improved error message identifies the specific subtrees with

mergeinfo that are stopping reintegrate from working.

(reintegrate_with_rename,

reintegrate_branch_never_merged_to,

reintegrate_with_subtree_mergeinfo): Remove XFails.

On the reintegrate-improvements branch: Add a new reintegrate test.

* subversion/tests/cmdline/merge_tests.py

(reintegrate_with_subtree_mergeinfo): New

(test_list): Add XFailing reintegrate_with_subtree_mergeinfo.

On the reintegrate-improvements branch: Merge r33950-34023 from trunk.
  1. … 180 more files in changeset.
On the reintegrate-improvements branch: Add some Subversion private helpers

for creating string representations of svn_mergeinfo_t and

svn_mergeinfo_catalog_t.

* subversion/include/private/svn_mergeinfo_private.h

(svn_mergeinfo__catalog_to_formatted_string): New.

(svn_mergeinfo__to_formatted_string): New.

* subversion/libsvn_subr/mergeinfo.c

(mergeinfo_to_stringbuf): Accept optional prefix arg.

(svn_mergeinfo_to_string): Update call to mergeinfo_to_stringbuf().

(svn_mergeinfo__catalog_to_formatted_string): New.

(svn_mergeinfo__to_formatted_string): New.

On the issue-3067-deleted-subtrees branch: Correct the expectations of an

XFailing --reintegrate merge test.

* subversion/tests/cmdline/merge_tests.py

(reintegrate_branch_never_merged_to): Another small expectation change,

another big comment to explain why.

On the reintegrate-improvements branch: New API for making deep copies of

mergeinfo catalogs.

* subversion/include/svn_mergeinfo.h

(svn_mergeinfo_catalog_dup): New declaration.

* subversion/libsvn_subr/mergeinfo.c

(svn_mergeinfo_catalog_dup): New definition.

On the issue-3067-deleted-subtrees branch: Correct the expectations of an

XFailing --reintegrate merge test.

* subversion/tests/cmdline/merge_tests.py

(reintegrate_with_rename): Small expectation change, big comment to

explain why.

On the reintegrate-improvements branch: Merge r33779-33949 from trunk.
  1. … 170 more files in changeset.
Create new branch, "reintegrate-improvements", to explore possibility of

making svn merge --reintegrate more tolerant of subtree mergeinfo.