subversion-users mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Nico Kadel-Garcia <nka...@gmail.com>
Subject Re: Correct way to undo commit of a tag?
Date Wed, 25 Feb 2015 02:31:46 GMT
On Tue, Feb 24, 2015 at 9:49 AM, David Aldrich
<David.Aldrich@emea.nec.com> wrote:
> 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?

Make another tag, whether or not you delete the old one, to avoid
confusion about working, checkout out copies of the tag.

Mime
View raw message