Mailing-List: contact users-help@subversion.apache.org; run by ezmlm
Precedence: bulk
From: Scott Bloom <scott@towel42.com>
To: Subversion <users@subversion.apache.org>
Subject: Difference between merge -c and merge -r
Thread-Topic: Difference between merge -c and merge -r
Thread-Index: AdM5OJYX09HxVN6cS1GW2epFCgKsHg==
Date: Fri, 29 Sep 2017 15:36:27 +0000
Message-ID: <BN3PR1001MB105814013CC9F15595C65228A97E0@BN3PR1001MB1058.namprd10.prod.outlook.com>
Accept-Language: en-US
Content-Language: en-US
received-spf: None (protection.outlook.com: towel42.com does not designate
 permitted sender hosts)
spamdiagnosticoutput: 1:99
spamdiagnosticmetadata: NSPM
Content-Type: multipart/alternative;
	boundary="_000_BN3PR1001MB105814013CC9F15595C65228A97E0BN3PR1001MB1058_"
MIME-Version: 1.0
X-MS-Exchange-CrossTenant-originalarrivaltime: 29 Sep 2017 15:36:27.9079
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: e45d99a0-3838-44ca-b04e-759b525a955e
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN3PR1001MB1058
archived-at: Fri, 29 Sep 2017 15:36:45 -0000

--_000_BN3PR1001MB105814013CC9F15595C65228A97E0BN3PR1001MB1058_
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: quoted-printable

After reading the docs, I cant for the life of me, figure out what the diff=
erence is.  Any pointer where I can learn what the difference in the two me=
rge techniques is?

Scott

--_000_BN3PR1001MB105814013CC9F15595C65228A97E0BN3PR1001MB1058_
Content-Type: text/html; charset="us-ascii"
Content-Transfer-Encoding: quoted-printable

<html xmlns:v=3D"urn:schemas-microsoft-com:vml" xmlns:o=3D"urn:schemas-micr=
osoft-com:office:office" xmlns:w=3D"urn:schemas-microsoft-com:office:word" =
xmlns:m=3D"http://schemas.microsoft.com/office/2004/12/omml" xmlns=3D"http:=
//www.w3.org/TR/REC-html40">
<head>
<meta http-equiv=3D"Content-Type" content=3D"text/html; charset=3Dus-ascii"=
>
<meta name=3D"Generator" content=3D"Microsoft Word 15 (filtered medium)">
<style><!--
/* Font Definitions */
@font-face
	{font-family:"Cambria Math";
	panose-1:2 4 5 3 5 4 6 3 2 4;}
@font-face
	{font-family:Calibri;
	panose-1:2 15 5 2 2 2 4 3 2 4;}
/* Style Definitions */
p.MsoNormal, li.MsoNormal, div.MsoNormal
	{margin:0in;
	margin-bottom:.0001pt;
	font-size:11.0pt;
	font-family:"Calibri",sans-serif;}
a:link, span.MsoHyperlink
	{mso-style-priority:99;
	color:blue;
	text-decoration:underline;}
a:visited, span.MsoHyperlinkFollowed
	{mso-style-priority:99;
	color:purple;
	text-decoration:underline;}
span.EmailStyle17
	{mso-style-type:personal-compose;
	font-family:"Calibri",sans-serif;
	color:windowtext;}
.MsoChpDefault
	{mso-style-type:export-only;
	font-family:"Calibri",sans-serif;}
@page WordSection1
	{size:8.5in 11.0in;
	margin:1.0in 1.0in 1.0in 1.0in;}
div.WordSection1
	{page:WordSection1;}
--></style><!--[if gte mso 9]><xml>
<o:shapedefaults v:ext=3D"edit" spidmax=3D"1026" />
</xml><![endif]--><!--[if gte mso 9]><xml>
<o:shapelayout v:ext=3D"edit">
<o:idmap v:ext=3D"edit" data=3D"1" />
</o:shapelayout></xml><![endif]-->
</head>
<body lang=3D"EN-US" link=3D"blue" vlink=3D"purple">
<div class=3D"WordSection1">
<p class=3D"MsoNormal">After reading the docs, I cant for the life of me, f=
igure out what the difference is.&nbsp; Any pointer where I can learn what =
the difference in the two merge techniques is?<br>
<br>
Scott<o:p></o:p></p>
</div>
</body>
</html>

--_000_BN3PR1001MB105814013CC9F15595C65228A97E0BN3PR1001MB1058_--