Paul Lussier <pll@lanminds.com> writes:
> In a message dated: 13 Mar 2003 12:49:19 PST
> Ben Collins-Sussman said:
>
> >pll@lanminds.com writes:
> >
> >> I'm trying to co a single file from an old rev into my current wc. I
> >> can't seem to figure out how to do this:
> >
> >Try 'svn copy -r 35 fileURL .'
> >
> >The file will be sucked from the repository, added to your working
> >copy, and will be scheduled for addition. This is the standard way of
> >"resurrecting" a deleted file.
>
> Hmmm, am I doing something wrong, or is something very broken?
>
> $ svn copy -r 35 http://web/svn/web/trunk/cgi-bin/wiki.pl .
> svn: Obstructed update
> svn: `wiki.pl' is in the way
> $ rm wiki.pl
> $ svn copy -r 35 http://web/svn/web/trunk/cgi-bin/wiki.pl .
> svn: Unmergeable scheduling requested on an entry
> svn: fold_state_changes: Entry 'wiki.pl' already under revision control
> $
>
> I do get the file I wanted, however, sould I be getting these types
> or messages? I would have expected something more indicative of
> success. This seems to indicate there was a problem.
Um, you can't 'svn add' a new item to your working copy if it's
already under version control. That's what the 'svn copy' command is
trying to do: suck down a file from the server, then schedule it for
addition.
What are you *actually* trying to do? If wiki.pl is already under
version control, do you just want to backdate its contents to r35?
If so, 'svn up -r35 wiki.pl' will do that.
Do you want to make the HEAD version of wiki.pl have the exact same
contents as r35 version of wiki.pl?
If so, run 'svn merge -rHEAD:35 http://path/to/wiki.pl'. Then commit.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Mar 13 22:47:43 2003