wait my bad. in the documentation it says that -c was a shortcut for
specifying what revisions are targetted in the merge. I did this and it
worked fine:
svn merge -r HEAD:796 .
On 9/10/07, aaron smith <beingthexemplarylists@gmail.com> wrote:
>
> Interesting. That would technically work but I dion't think the latest svn
> has support for that anymore. The help docs don't have the -c/--change
> switch, and it errors out when trying it.. (svn merge --change 796)
>
> I'll probably just delete the head and recreate it based off of that tag.
> I don't see any other graceful ways so far.. the --change was graceful, but
> not supported.
>
> dah.
>
> On 9/9/07, Ryan Schmidt <subversion-2007b@ryandesign.com> wrote:
> >
> >
> > On Sep 9, 2007, at 23:36, 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, but then technically the tag wouldn't work as it points to
> > > older version of trunk.. Should I use the svn move command? (svn
> > > move ./tags/release_1.3.1_rev796 ./trunk --force)?
> >
> > Doesn't matter if you delete the head of trunk. The history of trunk
> > is still there in the repository, the tag still points to a point in
> > that history, you can copy the tag to the new trunk if you like.
> >
> > Another option is to keep the trunk right where it is and just undo
> > those 12 revisions that you didn't like. See "Undoing changes" in the
> > book for the reverse merging procedure:
> >
> > http://svnbook.red-bean.com/en/1.4/
> > svn.branchmerge.commonuses.html#svn.branchmerge.commonuses.undo
> >
> >
> >
>
Received on Mon Sep 10 09:20:01 2007