> I tried that, but it doesn't prune files that have been added to trunk.
And that is the correct way of working. ;) Do it in two steps:
1) Merge the unwanted changes out of the trunk.
Again in a working copy of the trunk.
svn log trunk
Then for each change:
a) svn merge -c -NUMBER http://sourceforge/svn/repos/olb20/ePay/trunk .
Or for a range of changes:
b) svn merge -r NUMBER1:NUMBER2 http://sourceforge/svn/repos/olb20/ePay/trunk .
Check your changes, that it is the way, before the commits on the tag. If so, check in the working copy. You are on the starting position, before the mess up.
Merge in the changes from the tag:
svn merge -c 426 http://sourceforge/svn/repos/olb20/ePay/ .
Check your changes, that it is the way, after the commits on the tag. If so, check in the working copy. You are clean again.
From: Todd Nine [mailto:todd.nine_at_gmail.com]
Sent: Wed 1/23/2008 5:23 PM
Subject: Re: Roll back on a tag
I tried that, but it doesn't prune files that have been added to trunk.
Basically, I have a huge mess on my hands. 1 dev was working in trunk on
his own prototype and we want to discard all of his changes, unfortunately
they're all in trunk, otherwise I could just delete the branch :). The
other developer accidentally committed his changes to a "tag" directory.
So, I'm trying to completely replace everything recursively in trunk, since
we don't want to keep the changes, with the changes that are accidentally
committed in the tag directory (revision 426). I've tried svn copy, but
this didn't work. I'm a bit timid to delete everything in trunk, then
perform a copy, but is this my only route?
On Jan 23, 2008 10:48 AM, <nicklist_at_planet.nl> wrote:
> By accident, this got offlist.
> You would merge the changes from the tag, into a working copy of the
> 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)
> Nick Stolwijk
> -----Original Message-----
> From: Todd Nine [mailto:todd.nine_at_gmail.com <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
> 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
> to revision 211, so our source in the tag is preserved. Now I need to
> the changes from "tags/ePay-1.0.5" revision 426 (the accidental commit)
> 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
> 426 from the accidental commit to my workspace, but it doesn't seem to
> work. I've tried the following.
> svn copy -r 426
> This doesn't work. Any suggestions on how to accomplish this?
> 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
> > so this will probably remove your tag. You can do svn merge -r HEAD:211
> > the correct functionality. This will create a new revision HEAD + 1
> > 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
> > to
> > the same tag. I found a way to do it here.
> > 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:34:40 CET