You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ju...@apache.org on 2011/02/17 15:14:19 UTC
svn commit: r1071618 - in /subversion/branches/1.6.x-r880146: ./
subversion/libsvn_wc/props.c
Author: julianfoad
Date: Thu Feb 17 14:14:19 2011
New Revision: 1071618
URL: http://svn.apache.org/viewvc?rev=1071618&view=rev
Log:
On the '1.6.x-r880146' branch, merge r880146 from trunk.
Summary of original log message:
When in `--dry-run' mode of `svn merge' command, property conflicts made an
interactive callback to the user to resolve the conflicts, unlike the text
conflicts. Suppress the interactive callback in `--dry-run' mode.
Modified:
subversion/branches/1.6.x-r880146/ (props changed)
subversion/branches/1.6.x-r880146/subversion/libsvn_wc/props.c
Propchange: subversion/branches/1.6.x-r880146/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb 17 14:14:19 2011
@@ -101,4 +101,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-876615,876628,876633,876641,876645,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,87745
9,877472,877544,877553,877565,877568,877573,877593,877595,877597,877601,877612,877665,877667,877681,877692,877696,877701,877720,877730,877784,877793,877797,877809,877814-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,907644,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,945350,946355,946767,947006,948512,948916,949307,950931,950933,951753,952992,953317,955369,957507,958024,959004,959760,961055,961970,964167,964349,964767,965405,965469,965508,979045,979429,980811,981449,981921,984565,984928,984931,991534,996884,997026,997070,997457,997466,997471,997474,1000038,1000060,1000607,1000612,1001009,1002094,1005446,1022675,1024269,1027957,1028108,1031165,1031
186,1032808,1033166,1033290,1033665,1033685,1033921,1034557,1035745,1036534,1038792,1039040,1041438,1051632,1051638,1051744-1051745,1051751,1053185,1053208,1058722
+/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-876615,876628,876633,876641,876645,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,87745
9,877472,877544,877553,877565,877568,877573,877593,877595,877597,877601,877612,877665,877667,877681,877692,877696,877701,877720,877730,877784,877793,877797,877809,877814-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,880146,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,907644,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,945350,946355,946767,947006,948512,948916,949307,950931,950933,951753,952992,953317,955369,957507,958024,959004,959760,961055,961970,964167,964349,964767,965405,965469,965508,979045,979429,980811,981449,981921,984565,984928,984931,991534,996884,997026,997070,997457,997466,997471,997474,1000038,1000060,1000607,1000612,1001009,1002094,1005446,1022675,1024269,1027957,1028108,10311
65,1031186,1032808,1033166,1033290,1033665,1033685,1033921,1034557,1035745,1036534,1038792,1039040,1041438,1051632,1051638,1051744-1051745,1051751,1053185,1053208,1058722
Modified: subversion/branches/1.6.x-r880146/subversion/libsvn_wc/props.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x-r880146/subversion/libsvn_wc/props.c?rev=1071618&r1=1071617&r2=1071618&view=diff
==============================================================================
--- subversion/branches/1.6.x-r880146/subversion/libsvn_wc/props.c (original)
+++ subversion/branches/1.6.x-r880146/subversion/libsvn_wc/props.c Thu Feb 17 14:14:19 2011
@@ -1135,6 +1135,7 @@ maybe_generate_propconflict(svn_boolean_
const svn_string_t *working_val,
svn_wc_conflict_resolver_func_t conflict_func,
void *conflict_baton,
+ svn_boolean_t dry_run,
apr_pool_t *pool)
{
svn_wc_conflict_result_t *result = NULL;
@@ -1143,7 +1144,7 @@ maybe_generate_propconflict(svn_boolean_
svn_wc_conflict_description_t *cdesc;
const char *dirpath = svn_path_dirname(path, filepool);
- if (! conflict_func)
+ if (! conflict_func || dry_run)
{
/* Just postpone the conflict. */
*conflict_remains = TRUE;
@@ -1364,6 +1365,7 @@ apply_single_prop_add(svn_wc_notify_stat
const svn_string_t *new_val,
svn_wc_conflict_resolver_func_t conflict_func,
void *conflict_baton,
+ svn_boolean_t dry_run,
svn_wc_adm_access_t *adm_access,
apr_pool_t *pool)
@@ -1400,7 +1402,7 @@ apply_single_prop_add(svn_wc_notify_stat
NULL, new_val,
base_val, working_val,
conflict_func, conflict_baton,
- pool));
+ dry_run, pool));
if (got_conflict)
*conflict = svn_string_createf
(pool,
@@ -1416,7 +1418,8 @@ apply_single_prop_add(svn_wc_notify_stat
is_dir, propname,
working_props, NULL, new_val,
base_val, NULL,
- conflict_func, conflict_baton, pool));
+ conflict_func, conflict_baton,
+ dry_run, pool));
if (got_conflict)
*conflict = svn_string_createf
(pool, _("Trying to create property '%s' with value '%s',\n"
@@ -1459,6 +1462,7 @@ apply_single_prop_delete(svn_wc_notify_s
const svn_string_t *old_val,
svn_wc_conflict_resolver_func_t conflict_func,
void *conflict_baton,
+ svn_boolean_t dry_run,
svn_wc_adm_access_t *adm_access,
apr_pool_t *pool)
{
@@ -1489,7 +1493,7 @@ apply_single_prop_delete(svn_wc_notify_s
old_val, NULL,
base_val, working_val,
conflict_func, conflict_baton,
- pool));
+ dry_run, pool));
if (got_conflict)
*conflict = svn_string_createf
(pool,
@@ -1510,7 +1514,8 @@ apply_single_prop_delete(svn_wc_notify_s
is_dir, propname,
working_props, old_val, NULL,
base_val, working_val,
- conflict_func, conflict_baton, pool));
+ conflict_func, conflict_baton,
+ dry_run, pool));
if (got_conflict)
*conflict = svn_string_createf
(pool,
@@ -1542,6 +1547,7 @@ apply_single_mergeinfo_prop_change(svn_w
const svn_string_t *new_val,
svn_wc_conflict_resolver_func_t conflict_func,
void *conflict_baton,
+ svn_boolean_t dry_run,
svn_wc_adm_access_t *adm_access,
apr_pool_t *pool)
{
@@ -1583,7 +1589,7 @@ apply_single_mergeinfo_prop_change(svn_w
old_val, new_val,
base_val, working_val,
conflict_func, conflict_baton,
- pool));
+ dry_run, pool));
if (got_conflict)
*conflict = svn_string_createf
(pool,
@@ -1648,6 +1654,7 @@ apply_single_generic_prop_change(svn_wc_
const svn_string_t *new_val,
svn_wc_conflict_resolver_func_t conflict_func,
void *conflict_baton,
+ svn_boolean_t dry_run,
svn_wc_adm_access_t *adm_access,
apr_pool_t *pool)
{
@@ -1671,7 +1678,7 @@ apply_single_generic_prop_change(svn_wc_
old_val, new_val,
base_val, working_val,
conflict_func, conflict_baton,
- pool));
+ dry_run, pool));
if (got_conflict)
{
/* Describe the conflict, referring to base_val as well as
@@ -1746,6 +1753,7 @@ apply_single_prop_change(svn_wc_notify_s
const svn_string_t *new_val,
svn_wc_conflict_resolver_func_t conflict_func,
void *conflict_baton,
+ svn_boolean_t dry_run,
svn_wc_adm_access_t *adm_access,
apr_pool_t *pool)
{
@@ -1764,8 +1772,8 @@ apply_single_prop_change(svn_wc_notify_s
working_props, conflict,
propname, base_val, old_val,
new_val, conflict_func,
- conflict_baton, adm_access,
- pool));
+ conflict_baton,
+ dry_run, adm_access, pool));
}
else
{
@@ -1776,8 +1784,8 @@ apply_single_prop_change(svn_wc_notify_s
working_props, conflict,
propname, base_val, old_val,
new_val, conflict_func,
- conflict_baton, adm_access,
- pool));
+ conflict_baton,
+ dry_run, adm_access, pool));
}
return SVN_NO_ERROR;
@@ -1862,21 +1870,21 @@ svn_wc__merge_props(svn_wc_notify_state_
working_props, &conflict,
propname, base_val, to_val,
conflict_func, conflict_baton,
- adm_access, pool));
+ dry_run, adm_access, pool));
else if (! to_val) /* delete an existing property */
SVN_ERR(apply_single_prop_delete(is_normal ? state : NULL, path, is_dir,
working_props, &conflict,
propname, base_val, from_val,
conflict_func, conflict_baton,
- adm_access, pool));
+ dry_run, adm_access, pool));
else /* changing an existing property */
SVN_ERR(apply_single_prop_change(is_normal ? state : NULL, path, is_dir,
working_props, &conflict,
propname, base_val, from_val, to_val,
conflict_func, conflict_baton,
- adm_access, pool));
+ dry_run, adm_access, pool));
/* merging logic complete, now we need to possibly log conflict