By accident, this got offlist.
You would merge the changes from the tag, into a working copy of the trunk.
svn co http://sourceforge/svn/repos/olb20/ePay/trunk epay
cd epay
svn merge -c 426 http://sourceforge/svn/repos/olb20/ePay/ .
Your workingcopy now should contain the changes.
Take a look at the svn help merge command. (Especially the difference between -c -426 and -c 426)
Hth,
Nick Stolwijk
-----Original Message-----
From: Todd Nine [mailto:todd.nine_at_gmail.com]
Sent: Wed 1/23/2008 4:38 PM
To: nicklist_at_planet.nl
Subject: Re: Roll back on a tag
Thanks guys, I was able to accomplish what I needed with the following
commands.
svn merge -c -426 http://sourceforge/svn/repos/olb20/ePay/tags/ePay-1.0.5/
svn merge -c -425 http://sourceforge/svn/repos/olb20/ePay/tags/ePay-1.0.5/
That removed the changes and allowed me to commit source that is equivalent
to revision 211, so our source in the tag is preserved. Now I need to move
the changes from "tags/ePay-1.0.5" revision 426 (the accidental commit) into
trunk, overwriting what is currently in the trunk. To do so, I check out
trunk, then tried to use svn copy to copy over the src directory of revision
426 from the accidental commit to my workspace, but it doesn't seem to
work. I've tried the following.
svn copy -r 426 http://sourceforge/svn/repos/olb20/ePay/tags/ePay-1.0.5/src
.
This doesn't work. Any suggestions on how to accomplish this?
Thanks,
Todd
On Jan 23, 2008 10:26 AM, <nicklist_at_planet.nl> wrote:
> svn merge -c -211 will roll back the changes created between 211 and 210,
> so this will probably remove your tag. You can do svn merge -r HEAD:211 for
> the correct functionality. This will create a new revision HEAD + 1 which
> will be the same as revision 211.
>
> Hth,
>
> Nick Stolwijk
>
>
> -----Original Message-----
> From: Todd Nine [mailto:todd.nine_at_gmail.com <todd.nine_at_gmail.com>]
> Sent: Wed 1/23/2008 3:24 PM
> To: users_at_subversion.tigris.org
> Subject: Roll back on a tag
>
> Hi All,
> I have a new dev who checked out a tag, then accidentally committed back
> to
> the same tag. I found a way to do it here.
>
>
> http://svnbook.red-bean.com/en/1.4/svn-book.html#svn.branchmerge.commonuses.undo
>
> However the current repository version is at 426, the tags "correct"
> version
> is 211. If I execute
>
> svn merge -c -211 http://sourceforge/epay/tags/epay-1.0.5
>
> Will that roll the whole repository back, or just the tag?
>
> Thanks,
> Todd
>
>
Received on 2008-01-23 17:09:31 CET