You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by hw...@apache.org on 2011/10/19 14:30:50 UTC
svn commit: r1186167 - in /subversion/branches/1.7.x: ./ STATUS
subversion/libsvn_client/mergeinfo.c
subversion/tests/cmdline/mergeinfo_tests.py
Author: hwright
Date: Wed Oct 19 12:30:49 2011
New Revision: 1186167
URL: http://svn.apache.org/viewvc?rev=1186167&view=rev
Log:
Merge r1163243, r1163383 from trunk:
* r1163243, r1163383
Fix issue #3791 'svn mergeinfo shows natural history of added subtrees
as eligible'.
Justification:
The 'svn mergeinfo [ -R | --depth [ files | immediates | infinity ] ]'
subcommand gives incorrect answers in some use cases.
Notes:
r1163243 is a test for the issue, r1163383 is the fix.
Votes:
+1: pburba, rhuijben, stsp
Modified:
subversion/branches/1.7.x/ (props changed)
subversion/branches/1.7.x/STATUS
subversion/branches/1.7.x/subversion/libsvn_client/mergeinfo.c
subversion/branches/1.7.x/subversion/tests/cmdline/mergeinfo_tests.py
Propchange: subversion/branches/1.7.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 19 12:30:49 2011
@@ -64,4 +64,4 @@
/subversion/branches/tree-conflicts:868291-873154
/subversion/branches/tree-conflicts-notify:873926-874008
/subversion/branches/uris-as-urls:1060426-1064427
-/subversion/trunk:1146013,1146121,1146219,1146222,1146274,1146492,1146555,1146606,1146620,1146684,1146781,1146832,1146834,1146870,1146899,1146904,1147293,1147299,1147309,1147882,1148071,1148083,1148094,1148131,1148374,1148424,1148566,1148588,1148652,1148662,1148699,1148853,1148877,1148882,1148936,1149103,1149105,1149135,1149141,1149160,1149228,1149240,1149343,1149371-1149372,1149377,1149398,1149401,1149539,1149572,1149627,1149675,1149701,1149713,1150242,1150254,1150260-1150261,1150266,1150302,1150327,1150368,1150372,1150441,1150506,1150812,1150853,1151036,1151177,1151610,1151854,1151906,1151911,1152129,1152140,1152189-1152190,1152267,1152282,1152286,1152726,1152809,1153138,1153141,1153416,1153540,1153566,1153799,1153807,1153968,1154009,1154023,1154115,1154119,1154121,1154144,1154155,1154159,1154165,1154215,1154225,1154273,1154278,1154379,1154382,1154461,1154717-1154718,1154733,1154908,1154982,1155015,1155044,1155124,1155131,1155160,1155313,1155334,1155391,1155404,1156085,115
6098,1156216,1156218,1156312,1156527,1156717,1156721,1156750,1156827,1156838,1157416,1158187,1158193-1158194,1158196,1158201,1158207,1158209-1158210,1158217,1158285,1158288,1158303,1158309,1158407,1158419,1158421,1158436,1158455,1158616-1158617,1158634,1158854,1158875,1158886,1158893,1158896,1158919,1158924,1158963,1159093,1159098,1159101,1159132,1159136,1159148,1159230,1159275,1159400,1159686,1159760,1159772,1160605,1160671,1160682,1160704-1160705,1160756,1161063,1161080,1161185,1161210,1161683,1161721,1162024,1162033,1162201,1162516,1162880,1162974,1162995,1163557,1163792,1163953,1164027,1164386,1164426,1164517,1164535,1164554,1164580,1164614,1164645,1164760,1164765,1166500,1166555,1166678,1167062,1167173,1167209,1167269,1167503,1167659,1167681,1169524,1169531,1169650,1171708,1173111,1173425,1173639,1174051,1174060,1174652,1174761,1174797-1174798,1174806,1175888,1176915,1176949,1177001,1177492,1178280,1178282,1178942,1179680,1179767,1181155,1181609,1181666,1182115,1182527,
1182904,1182909,1183054,1183263,1183347,1185222,1185242,1185280,1185282,1185730
+/subversion/trunk:1146013,1146121,1146219,1146222,1146274,1146492,1146555,1146606,1146620,1146684,1146781,1146832,1146834,1146870,1146899,1146904,1147293,1147299,1147309,1147882,1148071,1148083,1148094,1148131,1148374,1148424,1148566,1148588,1148652,1148662,1148699,1148853,1148877,1148882,1148936,1149103,1149105,1149135,1149141,1149160,1149228,1149240,1149343,1149371-1149372,1149377,1149398,1149401,1149539,1149572,1149627,1149675,1149701,1149713,1150242,1150254,1150260-1150261,1150266,1150302,1150327,1150368,1150372,1150441,1150506,1150812,1150853,1151036,1151177,1151610,1151854,1151906,1151911,1152129,1152140,1152189-1152190,1152267,1152282,1152286,1152726,1152809,1153138,1153141,1153416,1153540,1153566,1153799,1153807,1153968,1154009,1154023,1154115,1154119,1154121,1154144,1154155,1154159,1154165,1154215,1154225,1154273,1154278,1154379,1154382,1154461,1154717-1154718,1154733,1154908,1154982,1155015,1155044,1155124,1155131,1155160,1155313,1155334,1155391,1155404,1156085,115
6098,1156216,1156218,1156312,1156527,1156717,1156721,1156750,1156827,1156838,1157416,1158187,1158193-1158194,1158196,1158201,1158207,1158209-1158210,1158217,1158285,1158288,1158303,1158309,1158407,1158419,1158421,1158436,1158455,1158616-1158617,1158634,1158854,1158875,1158886,1158893,1158896,1158919,1158924,1158963,1159093,1159098,1159101,1159132,1159136,1159148,1159230,1159275,1159400,1159686,1159760,1159772,1160605,1160671,1160682,1160704-1160705,1160756,1161063,1161080,1161185,1161210,1161683,1161721,1162024,1162033,1162201,1162516,1162880,1162974,1162995,1163243,1163383,1163557,1163792,1163953,1164027,1164386,1164426,1164517,1164535,1164554,1164580,1164614,1164645,1164760,1164765,1166500,1166555,1166678,1167062,1167173,1167209,1167269,1167503,1167659,1167681,1169524,1169531,1169650,1171708,1173111,1173425,1173639,1174051,1174060,1174652,1174761,1174797-1174798,1174806,1175888,1176915,1176949,1177001,1177492,1178280,1178282,1178942,1179680,1179767,1181155,1181609,1181666,
1182115,1182527,1182904,1182909,1183054,1183263,1183347,1185222,1185242,1185280,1185282,1185730
Modified: subversion/branches/1.7.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1186167&r1=1186166&r2=1186167&view=diff
==============================================================================
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Wed Oct 19 12:30:49 2011
@@ -76,14 +76,3 @@ Veto-blocked changes:
Approved changes:
=================
-
- * r1163243, r1163383
- Fix issue #3791 'svn mergeinfo shows natural history of added subtrees
- as eligible'.
- Justification:
- The 'svn mergeinfo [ -R | --depth [ files | immediates | infinity ] ]'
- subcommand gives incorrect answers in some use cases.
- Notes:
- r1163243 is a test for the issue, r1163383 is the fix.
- Votes:
- +1: pburba, rhuijben, stsp
Modified: subversion/branches/1.7.x/subversion/libsvn_client/mergeinfo.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/libsvn_client/mergeinfo.c?rev=1186167&r1=1186166&r2=1186167&view=diff
==============================================================================
--- subversion/branches/1.7.x/subversion/libsvn_client/mergeinfo.c (original)
+++ subversion/branches/1.7.x/subversion/libsvn_client/mergeinfo.c Wed Oct 19 12:30:49 2011
@@ -1319,16 +1319,20 @@ svn_client__elide_mergeinfo_catalog(svn_
Return a pointer to the mergeinfo value of the nearest path-wise ancestor
of ABS_REPOS_PATH in DEPTH_FIRST_CATALOG_INDEX. A path is considered its
own ancestor, so if a key exactly matches ABS_REPOS_PATH, return that
- key's mergeinfo.
+ key's mergeinfo and set *ANCESTOR_IS_SELF to true (set it to false in all
+ other cases).
If DEPTH_FIRST_CATALOG_INDEX is NULL, empty, or no ancestor is found, then
return NULL. */
static svn_mergeinfo_t
find_nearest_ancestor(const apr_array_header_t *depth_first_catalog_index,
+ svn_boolean_t *ancestor_is_self,
const char *abs_repos_path)
{
int ancestor_index = -1;
+ *ancestor_is_self = FALSE;
+
if (depth_first_catalog_index)
{
int i;
@@ -1337,9 +1341,18 @@ find_nearest_ancestor(const apr_array_he
{
svn_sort__item_t item = APR_ARRAY_IDX(depth_first_catalog_index, i,
svn_sort__item_t);
- if (svn_fspath__is_ancestor(item.key, abs_repos_path)
- || svn_path_compare_paths(item.key, abs_repos_path) == 0)
- ancestor_index = i;
+ if (svn_fspath__is_ancestor(item.key, abs_repos_path))
+ {
+ ancestor_index = i;
+
+ /* There's no nearer ancestor than ABS_REPOS_PATH itself. */
+ if (strcmp(item.key, abs_repos_path) == 0)
+ {
+ *ancestor_is_self = TRUE;
+ break;
+ }
+ }
+
}
}
@@ -1466,6 +1479,7 @@ filter_log_entry_with_rangelist(void *ba
svn_boolean_t found_this_revision = FALSE;
const char *merge_source_rel_target;
const char *merge_source_path;
+ svn_boolean_t ancestor_is_self;
svn_pool_clear(iterpool);
@@ -1501,7 +1515,36 @@ filter_log_entry_with_rangelist(void *ba
nearest_ancestor_mergeinfo =
find_nearest_ancestor(fleb->depth_first_catalog_index,
+ &ancestor_is_self,
target_path_affected);
+
+ /* Issue #3791: A path should never have explicit mergeinfo
+ describing its own addition (that's self-referential). Nor will
+ it have explicit mergeinfo describing its own deletion (we
+ obviously can't add new mergeinfo to a path we are deleting).
+
+ This lack of explicit mergeinfo should not cause such revisions
+ to show up as eligible however. If PATH was deleted, replaced,
+ or added in LOG_ENTRY->REVISION, but the corresponding
+ TARGET_PATH_AFFECTED already exists and has explicit mergeinfo
+ describing merges from PATH *after* LOG_ENTRY->REVISION, then
+ ignore this PATH. If it was deleted in LOG_ENTRY->REVISION it's
+ obviously back. If it was added or replaced it's still around
+ possibly it was replaced one or more times, but it's back now.
+ Regardless, LOG_ENTRY->REVISION is *not* an eligible revision! */
+ if (ancestor_is_self /* Explicit mergeinfo on TARGET_PATH_AFFECTED */
+ && (change->action != 'M'))
+ {
+ apr_array_header_t *rangelist = apr_hash_get(
+ nearest_ancestor_mergeinfo, path, APR_HASH_KEY_STRING);
+ svn_merge_range_t *youngest_range = APR_ARRAY_IDX(
+ rangelist, rangelist->nelts - 1, svn_merge_range_t *);
+
+ if (youngest_range
+ && (youngest_range->end > log_entry->revision))
+ continue;
+ }
+
if (nearest_ancestor_mergeinfo)
{
for (hi2 = apr_hash_first(iterpool, nearest_ancestor_mergeinfo);
Modified: subversion/branches/1.7.x/subversion/tests/cmdline/mergeinfo_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/tests/cmdline/mergeinfo_tests.py?rev=1186167&r1=1186166&r2=1186167&view=diff
==============================================================================
--- subversion/branches/1.7.x/subversion/tests/cmdline/mergeinfo_tests.py (original)
+++ subversion/branches/1.7.x/subversion/tests/cmdline/mergeinfo_tests.py Wed Oct 19 12:30:49 2011
@@ -624,6 +624,61 @@ def wc_target_inherits_mergeinfo_from_re
test_svn_mergeinfo_4_way(D_COPY_path)
test_svn_mergeinfo_4_way(subtree_wc)
+#----------------------------------------------------------------------
+# A test for issue 3791 'svn mergeinfo shows natural history of added
+# subtrees as eligible'.
+@Issue(3791)
+@SkipUnless(server_has_mergeinfo)
+def natural_history_is_not_eligible_nor_merged(sbox):
+ "natural history is not eligible nor merged"
+
+ sbox.build()
+ wc_dir = sbox.wc_dir
+ wc_disk, wc_status = set_up_branch(sbox)
+
+ nu_path = os.path.join(wc_dir, 'A', 'C', 'nu')
+ A_COPY_path = os.path.join(wc_dir, 'A_COPY')
+ nu_COPY_path = os.path.join(wc_dir, 'A_COPY', 'C', 'nu')
+
+ # r7 - Add a new file A/C/nu
+ svntest.main.file_write(nu_path, "This is the file 'nu'.\n")
+ svntest.actions.run_and_verify_svn(None, None, [], 'add', nu_path)
+ svntest.actions.run_and_verify_svn(None, None, [], 'ci',
+ '-m', 'Add a file', wc_dir)
+
+ # r8 - Sync merge ^/A to A_COPY
+ svntest.actions.run_and_verify_svn(None, None, [], 'merge',
+ sbox.repo_url + '/A', A_COPY_path)
+ svntest.actions.run_and_verify_svn(None, None, [], 'ci',
+ '-m', 'Add a file', wc_dir)
+
+ # r9 - Modify the file added in r7
+ svntest.main.file_write(nu_path, "Modification to file 'nu'.\n")
+ svntest.actions.run_and_verify_svn(None, None, [], 'ci',
+ '-m', 'Modify added file', wc_dir)
+
+ # r10 - Merge ^/A/C/nu to A_COPY/C/nu, creating subtree mergeinfo.
+ svntest.actions.run_and_verify_svn(None, None, [], 'merge',
+ sbox.repo_url + '/A/C/nu', nu_COPY_path)
+ svntest.actions.run_and_verify_svn(None, None, [], 'ci',
+ '-m', 'Add a file', wc_dir)
+ svntest.actions.run_and_verify_svn(None, None, [], 'up', wc_dir)
+
+ # We've effectively merged everything from ^/A to A_COPY, check
+ # that svn mergeinfo -R agrees.
+ #
+ # First check if there are eligible revisions, there should be none.
+ svntest.actions.run_and_verify_mergeinfo(
+ adjust_error_for_server_version(''),
+ [], sbox.repo_url + '/A',
+ A_COPY_path, '--show-revs', 'eligible', '-R')
+
+ # Now check that all operative revisions show as merged.
+ svntest.actions.run_and_verify_mergeinfo(
+ adjust_error_for_server_version(''),
+ ['3','4','5','6','7','9'], sbox.repo_url + '/A',
+ A_COPY_path, '--show-revs', 'merged', '-R')
+
########################################################################
# Run the tests
@@ -639,6 +694,7 @@ test_list = [ None,
recursive_mergeinfo,
mergeinfo_on_pegged_wc_path,
wc_target_inherits_mergeinfo_from_repos,
+ natural_history_is_not_eligible_nor_merged,
]
if __name__ == '__main__':