Merge the changes between trunk r6 and r7 of main.c to the tagged
version of main.c.
svn merge -r 6:7 $(REPO)/trunk/main.c
svn commit -m "Merging r7 into tag"
Sly
David F. Newman wrote:
> I want to move a tag from a file from on revision to the same file in another
> revision, but I can't figure out how to do it in a single commit.
>
> For example, say I tagged revision 6 of main.c as 1.0. But I made a mistake
> and it shoud've been revision 7.
>
> So what I first tried was
> $ svn delete main.c
> $ svn copy -r 7 ${REPO}/trunk/main.c .
>
> But this errors out saying main.c still exists in the current directory. So I
> end up having to do this
>
> $ svn delete main.c
> $ svn commit -m "Preparing a retag"
> $ svn copy -r 7 ${REPO}/trunk/main.c .
> $ svn commit -m "Finishing the retag"
>
> I even tried
> $ svn switch -r 7 ${REPO}/trunk/main.c main.c
> $ svn commit
>
> But the commit does nothing. A status shows that main.c has been switched.
>
> Is there a way to do this?
>
> -Dave
>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: users-help@subversion.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Nov 5 01:02:52 2004