Return-Path: 
 <users-return-22915-apmail-subversion-users-archive=subversion.apache.org@subversion.apache.org>
X-Original-To: apmail-subversion-users-archive@minotaur.apache.org
Delivered-To: apmail-subversion-users-archive@minotaur.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 175E717318
	for <apmail-subversion-users-archive@minotaur.apache.org>;
 Tue, 24 Feb 2015 14:52:01 +0000 (UTC)
Received: (qmail 4662 invoked by uid 500); 24 Feb 2015 14:51:54 -0000
Delivered-To: apmail-subversion-users-archive@subversion.apache.org
Received: (qmail 4625 invoked by uid 500); 24 Feb 2015 14:51:54 -0000
Mailing-List: contact users-help@subversion.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:users-help@subversion.apache.org>
List-Unsubscribe: <mailto:users-unsubscribe@subversion.apache.org>
List-Post: <mailto:users@subversion.apache.org>
List-Id: <users.subversion.apache.org>
Delivered-To: mailing list users@subversion.apache.org
Received: (qmail 4614 invoked by uid 99); 24 Feb 2015 14:51:54 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 24 Feb 2015 14:51:54 +0000
X-ASF-Spam-Status: No, hits=1.5 required=5.0
	tests=HTML_MESSAGE,RCVD_IN_DNSWL_LOW,SPF_HELO_PASS,SPF_PASS
X-Spam-Check-By: apache.org
Received-SPF: pass (nike.apache.org: domain of David.Aldrich@emea.nec.com
 designates 85.115.52.190 as permitted sender)
Received: from [85.115.52.190] (HELO cluster-a.mailcontrol.com)
 (85.115.52.190)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 24 Feb 2015 14:51:27 +0000
Received: from mail1.neceur.com (mail1.neceur.com [195.47.207.3])
	by rly04a.srv.mailcontrol.com (MailControl) with ESMTP id t1OEnLbi028925
	for <users@subversion.apache.org>; Tue, 24 Feb 2015 14:49:21 GMT
Received: from intmail2.neceur.com (intmail2.neceur.com [172.29.177.11])
	by mail1.neceur.com (8.14.4/8.14.4) with ESMTP id t1OEnLFq031086
	for <users@subversion.apache.org>; Tue, 24 Feb 2015 14:49:21 GMT
Received: from av1.neceur.com (av1.neceur.com [172.29.14.21])
	by intmail2.neceur.com (8.13.8/8.13.8) with ESMTP id t1OEnLNX023519
	for <users@subversion.apache.org>; Tue, 24 Feb 2015 14:49:21 GMT
Received: from av1.neceur.com (unknown [127.0.0.1])
	by IMSVA80 (Postfix) with ESMTP id E18B7296B7A
	for <users@subversion.apache.org>; Tue, 24 Feb 2015 14:49:20 +0000 (GMT)
Received: from EX10CAS01.EU.NEC.COM (unknown [172.29.155.132])
	by av1.neceur.com (Postfix) with ESMTP id D4103296B74
	for <users@subversion.apache.org>; Tue, 24 Feb 2015 14:49:20 +0000 (GMT)
Received: from EX10MBX02.EU.NEC.COM ([169.254.2.56]) by EX10CAS01.EU.NEC.COM
 ([172.29.155.132]) with mapi id 14.03.0210.002; Tue, 24 Feb 2015 14:49:20
 +0000
From: David Aldrich <David.Aldrich@EMEA.NEC.COM>
To: "'users@subversion.apache.org' (users@subversion.apache.org)"
	<users@subversion.apache.org>
Subject: Correct way to undo commit of a tag?
Thread-Topic: Correct way to undo commit of a tag?
Thread-Index: AdBQQMFbHzfMqEnoR4yMP2dZ4kdyLA==
Date: Tue, 24 Feb 2015 14:49:19 +0000
Message-ID: <41302A7145AC054FA7A96CFD03835A0A0B945AEA@EX10MBX02.EU.NEC.COM>
Accept-Language: en-GB, en-US
Content-Language: en-US
X-MS-Has-Attach: 
X-MS-TNEF-Correlator: 
x-originating-ip: [172.29.68.112]
Content-Type: multipart/alternative;
	boundary="_000_41302A7145AC054FA7A96CFD03835A0A0B945AEAEX10MBX02EUNECC_"
MIME-Version: 1.0
X-Scanned-By: MailControl 37812.332 (www.mailcontrol.com) on 10.65.0.114
X-Virus-Checked: Checked by ClamAV on apache.org

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

Hi

My most recent commit was the creation of a tag.  I want to delete that tag=
.  Should I reverse merge the commit or simply delete the tag?

If I do a reverse merge I see a tree conflict:

C:\>svn merge -c -69 <my url>
--- Reverse-merging r69 into '.':
   C tags\TAG_<snip>
--- Recording mergeinfo for reverse merge of r69 into '.':
U   .
Tree conflict on 'tags\TAG_<snip>
   > local dir edit, incoming dir delete upon merge
Select: (r) mark resolved, (p) postpone, (q) quit resolution, (h) help:

What is the best thing to do here?

Best regards

David


--_000_41302A7145AC054FA7A96CFD03835A0A0B945AEAEX10MBX02EUNECC_
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:0cm;
	margin-bottom:.0001pt;
	font-size:11.0pt;
	font-family:"Calibri",sans-serif;
	mso-fareast-language:EN-US;}
a:link, span.MsoHyperlink
	{mso-style-priority:99;
	color:#0563C1;
	text-decoration:underline;}
a:visited, span.MsoHyperlinkFollowed
	{mso-style-priority:99;
	color:#954F72;
	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;
	mso-fareast-language:EN-US;}
@page WordSection1
	{size:612.0pt 792.0pt;
	margin:72.0pt 72.0pt 72.0pt 72.0pt;}
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-GB" link=3D"#0563C1" vlink=3D"#954F72">
<div class=3D"WordSection1">
<p class=3D"MsoNormal">Hi<o:p></o:p></p>
<p class=3D"MsoNormal"><o:p>&nbsp;</o:p></p>
<p class=3D"MsoNormal">My most recent commit was the creation of a tag.&nbs=
p; I want to delete that tag.&nbsp; Should I reverse merge the commit or si=
mply delete the tag?<o:p></o:p></p>
<p class=3D"MsoNormal"><o:p>&nbsp;</o:p></p>
<p class=3D"MsoNormal">If I do a reverse merge I see a tree conflict:<o:p><=
/o:p></p>
<p class=3D"MsoNormal"><o:p>&nbsp;</o:p></p>
<p class=3D"MsoNormal">C:\&gt;svn merge -c -69 &lt;my url&gt;<o:p></o:p></p=
>
<p class=3D"MsoNormal">--- Reverse-merging r69 into '.':<o:p></o:p></p>
<p class=3D"MsoNormal">&nbsp;&nbsp; C tags\TAG_&lt;snip&gt;<o:p></o:p></p>
<p class=3D"MsoNormal">--- Recording mergeinfo for reverse merge of r69 int=
o '.':<o:p></o:p></p>
<p class=3D"MsoNormal">U&nbsp;&nbsp; .<o:p></o:p></p>
<p class=3D"MsoNormal">Tree conflict on 'tags\TAG_&lt;snip&gt;<o:p></o:p></=
p>
<p class=3D"MsoNormal">&nbsp;&nbsp; &gt; local dir edit, incoming dir delet=
e upon merge<o:p></o:p></p>
<p class=3D"MsoNormal">Select: (r) mark resolved, (p) postpone, (q) quit re=
solution, (h) help:<o:p></o:p></p>
<p class=3D"MsoNormal"><o:p>&nbsp;</o:p></p>
<p class=3D"MsoNormal">What is the best thing to do here?<o:p></o:p></p>
<p class=3D"MsoNormal"><o:p>&nbsp;</o:p></p>
<p class=3D"MsoNormal"><span style=3D"mso-fareast-language:EN-GB">Best rega=
rds<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"mso-fareast-language:EN-GB"><o:p>&nbs=
p;</o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"mso-fareast-language:EN-GB">David<o:p=
></o:p></span></p>
<p class=3D"MsoNormal"><o:p>&nbsp;</o:p></p>
</div>
</body>
</html>

--_000_41302A7145AC054FA7A96CFD03835A0A0B945AEAEX10MBX02EUNECC_--