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 2010/06/18 19:04:04 UTC
svn commit: r956051 - in /subversion/branches/1.6.x: ./ CHANGES STATUS
subversion/libsvn_client/merge.c subversion/tests/cmdline/merge_tests.py
Author: hwright
Date: Fri Jun 18 17:04:04 2010
New Revision: 956051
URL: http://svn.apache.org/viewvc?rev=956051&view=rev
Log:
Reintegrate the 1.6.x-issue3623 branch:
* r939375-939376
Fix issue #3623, a bug in foreign repository merges that causes properties
on merge-added files to be dropped from commits of those merges.
Justification:
This can actually result in what is arguably a corrupt working copy,
one that thinks it is in sync with the repository but actually is not.
Notes:
r939375 tweaks a test to cover this case. r939376 is the fix.
Two simple conflicts occur when merging these two revisions.
Branch:
^/subversion/branches/1.6.x-issue3623
Votes:
+1: cmpilato, pburba, julianfoad
Modified:
subversion/branches/1.6.x/ (props changed)
subversion/branches/1.6.x/CHANGES (props changed)
subversion/branches/1.6.x/STATUS
subversion/branches/1.6.x/subversion/libsvn_client/merge.c
subversion/branches/1.6.x/subversion/tests/cmdline/merge_tests.py (contents, props changed)
Propchange: subversion/branches/1.6.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jun 18 17:04:04 2010
@@ -15,6 +15,7 @@
/subversion/branches/1.6.x-issue3519:880376-889934
/subversion/branches/1.6.x-issue3573:906488-923765
/subversion/branches/1.6.x-issue3605:923668-923887
+/subversion/branches/1.6.x-issue3623:952794-956049
/subversion/branches/1.6.x-issue3651:952977-954985
/subversion/branches/1.6.x-issue3654:953882-955338
/subversion/branches/1.6.x-no-svn_uri:876360-876415
@@ -80,4 +81,4 @@
/subversion/branches/tc_url_rev:874351-874483
/subversion/branches/tree-conflicts:868291-873154
/subversion/branches/tree-conflicts-notify:873926-874008
-/subversion/trunk:875965,875968,876004,876012,876017,876019,876022,876024,876032,876041-876042,876048,876051,876055-876056,876059,876083,876091,876097,876101,876104,876109,876123-876125,876129,876132,876138,876160,876167,876175,876180,876185,876205,876223-876225,876230,876233,876245,876252,876256,876283,876287,876312,876326-876327,876330,876366,876372,876374,876376,876383,876386,876442,876456-876457,876462-876464,876467,876469,876480,876486,876495-876497,876516-876518,876524,876526,876583,876601,876614,876628,876633,876641,876659,876687,876689,876705,876715,876726,876760,876763,876794,876804,876815-876816,876821,876825,876837,876840-876841,876843,876849,876857-876858,876862,876873,876890,876897,876905,876908,876925,876931,876934,876948-876949,876953,876987,876993,877011,877014,877016,877028-877029,877038,877119,877127,877146,877157,877191,877195,877203,877211,877230,877234,877237,877243,877249,877259,877261,877304,877319,877407,877437,877441-877442,877453,877459,877472,87754
4,877553,877565,877568,877573,877593,877595,877597,877601,877612,877665,877667,877681,877692,877696,877701,877720,877730,877784,877793,877797,877809,877815,877819,877821,877842,877848,877853,877867,877869,877873,877901,877909,877916,877931,877942,877953,877964,877968,877970,877981-877982,878005,878013,878015,878020,878046,878053,878062,878074,878080,878089,878091,878093,878095,878127,878129,878131,878142,878173-878176,878216,878240,878242,878255,878269,878272,878279,878296-878297,878303,878321,878335,878338,878341,878343,878353,878364,878367-878368,878385,878399,878423,878426,878447,878462,878484,878491,878498,878532,878595,878646,878659,878673,878682-878683,878690-878691,878693,878723,878760-878761,878873,878875,878877,878879,878905,878910-878911,878915-878916,878924-878925,878946,878949,878955,878960,878970,878981,879001,879033,879056,879074,879076,879081-879082,879093,879105,879126,879148,879170,879198-879199,879201,879271,879293,879357,879375-879376,879403,879631,879635-
879636,879688,879709-879711,879747,879902,879916,879954,879961,879966,879971,880082,880095,880105,880162,880226,880274-880275,880370,880450,880461,880474,880525-880526,880552,881905,884842,886164,886197,888715,888979,889081,889840,891672,892050,892085,895514,895653,896522,896915,898048,898963,899826,899828,900797,901304,901752,902093,904301,904394,904594,905303,905326,906256,906305,906587,908980-908981,917640,918211,922516,923389,923391,926151,926167,927323,927328,931209,931211,931392,931568,932942,933299,934599,934603,935631,935992,935996,937610,944635,950931,950933,951753,952992,953317
+/subversion/trunk:875965,875968,876004,876012,876017,876019,876022,876024,876032,876041-876042,876048,876051,876055-876056,876059,876083,876091,876097,876101,876104,876109,876123-876125,876129,876132,876138,876160,876167,876175,876180,876185,876205,876223-876225,876230,876233,876245,876252,876256,876283,876287,876312,876326-876327,876330,876366,876372,876374,876376,876383,876386,876442,876456-876457,876462-876464,876467,876469,876480,876486,876495-876497,876516-876518,876524,876526,876583,876601,876614,876628,876633,876641,876659,876687,876689,876705,876715,876726,876760,876763,876794,876804,876815-876816,876821,876825,876837,876840-876841,876843,876849,876857-876858,876862,876873,876890,876897,876905,876908,876925,876931,876934,876948-876949,876953,876987,876993,877011,877014,877016,877028-877029,877038,877119,877127,877146,877157,877191,877195,877203,877211,877230,877234,877237,877243,877249,877259,877261,877304,877319,877407,877437,877441-877442,877453,877459,877472,87754
4,877553,877565,877568,877573,877593,877595,877597,877601,877612,877665,877667,877681,877692,877696,877701,877720,877730,877784,877793,877797,877809,877815,877819,877821,877842,877848,877853,877867,877869,877873,877901,877909,877916,877931,877942,877953,877964,877968,877970,877981-877982,878005,878013,878015,878020,878046,878053,878062,878074,878080,878089,878091,878093,878095,878127,878129,878131,878142,878173-878176,878216,878240,878242,878255,878269,878272,878279,878296-878297,878303,878321,878335,878338,878341,878343,878353,878364,878367-878368,878385,878399,878423,878426,878447,878462,878484,878491,878498,878532,878595,878646,878659,878673,878682-878683,878690-878691,878693,878723,878760-878761,878873,878875,878877,878879,878905,878910-878911,878915-878916,878924-878925,878946,878949,878955,878960,878970,878981,879001,879033,879056,879074,879076,879081-879082,879093,879105,879126,879148,879170,879198-879199,879201,879271,879293,879357,879375-879376,879403,879631,879635-
879636,879688,879709-879711,879747,879902,879916,879954,879961,879966,879971,880082,880095,880105,880162,880226,880274-880275,880370,880450,880461,880474,880525-880526,880552,881905,884842,886164,886197,888715,888979,889081,889840,891672,892050,892085,895514,895653,896522,896915,898048,898963,899826,899828,900797,901304,901752,902093,904301,904394,904594,905303,905326,906256,906305,906587,908980-908981,917640,918211,922516,923389,923391,926151,926167,927323,927328,931209,931211,931392,931568,932942,933299,934599,934603,935631,935992,935996,937610,939375-939376,944635,950931,950933,951753,952992,953317
Propchange: subversion/branches/1.6.x/CHANGES
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jun 18 17:04:04 2010
@@ -15,6 +15,7 @@
/subversion/branches/1.6.x-issue3519/CHANGES:880376-889934
/subversion/branches/1.6.x-issue3573/CHANGES:906488-923765
/subversion/branches/1.6.x-issue3605/CHANGES:923668-923887
+/subversion/branches/1.6.x-issue3623/CHANGES:952794-956049
/subversion/branches/1.6.x-issue3651/CHANGES:952977-954985
/subversion/branches/1.6.x-issue3654/CHANGES:953882-955338
/subversion/branches/1.6.x-no-svn_uri/CHANGES:876360-876415
Modified: subversion/branches/1.6.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x/STATUS?rev=956051&r1=956050&r2=956051&view=diff
==============================================================================
--- subversion/branches/1.6.x/STATUS (original)
+++ subversion/branches/1.6.x/STATUS Fri Jun 18 17:04:04 2010
@@ -186,17 +186,3 @@ Veto-blocked changes:
Approved changes:
=================
-
- * r939375-939376
- Fix issue #3623, a bug in foreign repository merges that causes properties
- on merge-added files to be dropped from commits of those merges.
- Justification:
- This can actually result in what is arguably a corrupt working copy,
- one that thinks it is in sync with the repository but actually is not.
- Notes:
- r939375 tweaks a test to cover this case. r939376 is the fix.
- Two simple conflicts occur when merging these two revisions.
- Branch:
- ^/subversion/branches/1.6.x-issue3623
- Votes:
- +1: cmpilato, pburba, julianfoad
Modified: subversion/branches/1.6.x/subversion/libsvn_client/merge.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x/subversion/libsvn_client/merge.c?rev=956051&r1=956050&r2=956051&view=diff
==============================================================================
--- subversion/branches/1.6.x/subversion/libsvn_client/merge.c (original)
+++ subversion/branches/1.6.x/subversion/libsvn_client/merge.c Fri Jun 18 17:04:04 2010
@@ -1452,7 +1452,7 @@ merge_file_added(svn_wc_adm_access_t *ad
apr_pool_t *subpool = svn_pool_create(merge_b->pool);
svn_node_kind_t kind;
int i;
- apr_hash_t *new_props;
+ apr_hash_t *file_props;
/* In most cases, we just leave prop_state as unknown, and let the
content_state what happened, so we set prop_state here to avoid that
@@ -1464,7 +1464,7 @@ merge_file_added(svn_wc_adm_access_t *ad
*tree_conflicted = FALSE;
/* Apply the prop changes to a new hash table. */
- new_props = apr_hash_copy(subpool, original_props);
+ file_props = apr_hash_copy(subpool, original_props);
for (i = 0; i < prop_changes->nelts; ++i)
{
const svn_prop_t *prop = &APR_ARRAY_IDX(prop_changes, i, svn_prop_t);
@@ -1488,7 +1488,7 @@ merge_file_added(svn_wc_adm_access_t *ad
&& strcmp(prop->name, SVN_PROP_MERGEINFO) == 0)
continue;
- apr_hash_set(new_props, prop->name, APR_HASH_KEY_STRING, prop->value);
+ apr_hash_set(file_props, prop->name, APR_HASH_KEY_STRING, prop->value);
}
/* Easy out: if we have no adm_access for the parent directory,
@@ -1502,7 +1502,7 @@ merge_file_added(svn_wc_adm_access_t *ad
{
if (content_state)
*content_state = svn_wc_notify_state_changed;
- if (prop_state && apr_hash_count(new_props))
+ if (prop_state && apr_hash_count(file_props))
*prop_state = svn_wc_notify_state_changed;
}
else
@@ -1536,14 +1536,15 @@ merge_file_added(svn_wc_adm_access_t *ad
{
if (! merge_b->dry_run)
{
- const char *copyfrom_url = NULL;
- svn_revnum_t copyfrom_rev = SVN_INVALID_REVNUM;
- svn_stream_t *new_base_contents;
+ const char *copyfrom_url;
+ svn_revnum_t copyfrom_rev;
+ svn_stream_t *new_contents, *new_base_contents;
+ apr_hash_t *new_base_props, *new_props;
svn_wc_conflict_description_t *existing_conflict;
- /* If this is a merge from the same repository as our working copy,
- we handle adds as add-with-history. Otherwise, we'll use a pure
- add. */
+ /* If this is a merge from the same repository as our
+ working copy, we handle adds as add-with-history.
+ Otherwise, we'll use a pure add. */
if (merge_b->same_repos)
{
const char *child = svn_path_is_child(merge_b->target,
@@ -1556,10 +1557,22 @@ merge_file_added(svn_wc_adm_access_t *ad
copyfrom_url = merge_b->merge_source.url2;
copyfrom_rev = rev2;
SVN_ERR(check_scheme_match(adm_access, copyfrom_url));
+ new_base_props = file_props;
+ new_props = NULL; /* inherit from new_base_props */
+ SVN_ERR(svn_stream_open_readonly(&new_base_contents, yours,
+ subpool, subpool));
+ new_contents = NULL; /* inherit from new_base_contents */
+ }
+ else
+ {
+ copyfrom_url = NULL;
+ copyfrom_rev = SVN_INVALID_REVNUM;
+ new_base_props = apr_hash_make(subpool);
+ new_props = file_props;
+ new_base_contents = svn_stream_empty(subpool);
+ SVN_ERR(svn_stream_open_readonly(&new_contents, yours,
+ subpool, subpool));
}
-
- SVN_ERR(svn_stream_open_readonly(&new_base_contents, yours,
- subpool, subpool));
SVN_ERR(svn_wc__get_tree_conflict(&existing_conflict,
mine, adm_access,
@@ -1588,7 +1601,8 @@ merge_file_added(svn_wc_adm_access_t *ad
/* ### would be nice to have cancel/notify funcs to pass */
SVN_ERR(svn_wc_add_repos_file3(
mine, adm_access,
- new_base_contents, NULL, new_props, NULL,
+ new_base_contents, new_contents,
+ new_base_props, new_props,
copyfrom_url, copyfrom_rev,
NULL, NULL, NULL, NULL, subpool));
@@ -1597,7 +1611,7 @@ merge_file_added(svn_wc_adm_access_t *ad
}
if (content_state)
*content_state = svn_wc_notify_state_changed;
- if (prop_state && apr_hash_count(new_props))
+ if (prop_state && apr_hash_count(file_props))
*prop_state = svn_wc_notify_state_changed;
}
break;
Modified: subversion/branches/1.6.x/subversion/tests/cmdline/merge_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x/subversion/tests/cmdline/merge_tests.py?rev=956051&r1=956050&r2=956051&view=diff
==============================================================================
--- subversion/branches/1.6.x/subversion/tests/cmdline/merge_tests.py (original)
+++ subversion/branches/1.6.x/subversion/tests/cmdline/merge_tests.py Fri Jun 18 17:04:04 2010
@@ -10808,6 +10808,7 @@ def foreign_repos(sbox):
# Convenience variables for working copy paths.
Z_path = os.path.join(wc_dir, 'A', 'D', 'G', 'Z')
+ B_path = os.path.join(wc_dir, 'A', 'B')
Q_path = os.path.join(wc_dir, 'Q')
H_path = os.path.join(wc_dir, 'A', 'D', 'H')
iota_path = os.path.join(wc_dir, 'iota')
@@ -10816,21 +10817,24 @@ def foreign_repos(sbox):
zeta_path = os.path.join(wc_dir, 'A', 'D', 'G', 'Z', 'zeta')
fred_path = os.path.join(wc_dir, 'A', 'C', 'fred')
- # Add new directories
+ # Add new directories, with properties
svntest.main.run_svn(None, 'mkdir', Q_path, Z_path)
+ svntest.main.run_svn(None, 'pset', 'foo', 'bar', Q_path, Z_path)
- # Add new files
+ # Add new files, with contents and properties.
zeta_contents = "This is the file 'zeta'.\n"
fred_contents = "This is the file 'fred'.\n"
svntest.main.file_append(zeta_path, zeta_contents)
svntest.main.file_append(fred_path, fred_contents)
svntest.main.run_svn(None, 'add', zeta_path, fred_path)
-
- # Modify existing files
+ svntest.main.run_svn(None, 'pset', 'foo', 'bar', zeta_path, fred_path)
+
+ # Modify existing files and directories.
added_contents = "This is another line of text.\n"
svntest.main.file_append(iota_path, added_contents)
svntest.main.file_append(beta_path, added_contents)
-
+ svntest.main.run_svn(None, 'pset', 'foo', 'bar', iota_path, B_path)
+
# Delete some stuff
svntest.main.run_svn(None, 'delete', alpha_path, H_path)
@@ -10841,6 +10845,7 @@ def foreign_repos(sbox):
'A/D/G/Z/zeta' : Item(verb='Adding'),
'A/C/fred' : Item(verb='Adding'),
'iota' : Item(verb='Sending'),
+ 'A/B' : Item(verb='Sending'),
'A/B/E/beta' : Item(verb='Sending'),
'A/B/E/alpha' : Item(verb='Deleting'),
'A/D/H' : Item(verb='Deleting'),
@@ -10852,21 +10857,23 @@ def foreign_repos(sbox):
'A/D/G/Z/zeta' : Item(status=' ', wc_rev=2),
'A/C/fred' : Item(status=' ', wc_rev=2),
})
- expected_status.tweak('iota', 'A/B/E/beta', wc_rev=2)
+ expected_status.tweak('iota', 'A/B/E/beta', 'A/B', wc_rev=2)
expected_status.remove('A/B/E/alpha', 'A/D/H', 'A/D/H/chi',
'A/D/H/psi', 'A/D/H/omega')
expected_disk = svntest.main.greek_state.copy()
expected_disk.add({
- 'Q' : Item(),
- 'A/D/G/Z' : Item(),
- 'A/D/G/Z/zeta' : Item(contents=zeta_contents),
- 'A/C/fred' : Item(contents=fred_contents),
+ 'Q' : Item(props={'foo':'bar'}),
+ 'A/D/G/Z' : Item(props={'foo':'bar'}),
+ 'A/D/G/Z/zeta' : Item(contents=zeta_contents,props={'foo':'bar'}),
+ 'A/C/fred' : Item(contents=fred_contents,props={'foo':'bar'}),
})
expected_disk.remove('A/B/E/alpha', 'A/D/H', 'A/D/H/chi',
'A/D/H/psi', 'A/D/H/omega')
expected_disk.tweak('iota',
contents=expected_disk.desc['iota'].contents
- + added_contents)
+ + added_contents,
+ props={'foo':'bar'})
+ expected_disk.tweak('A/B', props={'foo':'bar'})
expected_disk.tweak('A/B/E/beta',
contents=expected_disk.desc['A/B/E/beta'].contents
+ added_contents)
@@ -10888,6 +10895,14 @@ def foreign_repos(sbox):
svntest.actions.verify_disk(wc_dir2, expected_disk,
None, None, None, None, 1)
+ # Now, let's make a third checkout -- our second from the original
+ # repository -- and make sure that all the data there is correct.
+ # It should look just like the original EXPECTED_DISK.
+ wc_dir3 = sbox.add_wc_path('wc3')
+ svntest.actions.run_and_verify_svn(None, None, [], 'checkout',
+ sbox2.repo_url, wc_dir3)
+ svntest.actions.verify_disk(wc_dir3, expected_disk,
+ None, None, None, None, 1)
def foreign_repos_uuid(sbox):
"verify uuid of items added via foreign repo merge"
Propchange: subversion/branches/1.6.x/subversion/tests/cmdline/merge_tests.py
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jun 18 17:04:04 2010
@@ -14,6 +14,7 @@
/subversion/branches/1.6.x-issue3519/subversion/tests/cmdline/merge_tests.py:880376-889934
/subversion/branches/1.6.x-issue3573/subversion/tests/cmdline/merge_tests.py:906488-923765
/subversion/branches/1.6.x-issue3605/subversion/tests/cmdline/merge_tests.py:923668-923887
+/subversion/branches/1.6.x-issue3623/subversion/tests/cmdline/merge_tests.py:952794-956049
/subversion/branches/1.6.x-issue3654/subversion/tests/cmdline/merge_tests.py:953882-955338
/subversion/branches/1.6.x-no-svn_uri/subversion/tests/cmdline/merge_tests.py:876360-876415
/subversion/branches/1.6.x-r36178/subversion/tests/cmdline/merge_tests.py:877876-877884