[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Reverting trunk back to a tag, what's the standard way?

From: Lorenz <lorenznl_at_yahoo.com>
Date: 2007-09-10 08:44:20 CEST

aaron smith wrote:

>DAH, the code I have in my project's trunk started breaking a lot of stuff.
>I'm only about 12 revision off. What is the best way to tag the contents of
>a tag and put it in trunk?
>
>I have a tag called "release_1.3.1_rev796" that I want to be in trunk now. I
>was thinking of deleting trunk and copying that tag to trunk,

that's one possible way.

> but then
>technically the tag wouldn't work as it points to older version of trunk..

no. The tag will still work as before, as you are deleting trunc one
at head, but it will still exists at previous revisions.

>Should I use the svn move command? (svn move ./tags/release_1.3.1_rev796
>./trunk --force)?

that would delete the tag (at head), if that's what you want you can
do that.

The second possibility to get your trunc back to the state when the
tag was cut is a "reverse merge". See
http://svnbook.red-bean.com/nightly/en/svn.branchmerge.commonuses.html#svn.branchmerge.commonuses.undo
for that.

The only difference between the results of that opererations is how
they are represented in the "history" (log) of trunc.

Where deleting trunc and copying the tag will show were the tag was
copied of the trunc and then back to trunc, the "reverse merge"
variant needs documenting what was done in the log message.

As long the tag is realy only a copy of trunc, which methode to chose
is only a matter of taste.

Lorenz

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Sep 11 06:05:45 2007

This is an archived mail posted to the Subversion Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.