You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by pl...@lanminds.com on 2003/03/13 20:46:47 UTC
checking out an old rev?
Hi,
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:
svn co -N -r 35 http://web/svn/web/trunk/cgi-bin/wiki.pl
svn: Error string not specified yet
svn: URL does not identify a collection.
I've tried merge, but I think I'm screwing that up too:
svn merge -r 35:48 ./wiki.pl .
svn: RA layer request failed
svn: REPORT request failed on /svn/centera_web/trunk/cgi-bin/wiki.pl
svn: The REPORT request returned invalid XML in the response: Unknown XML\
element `error (in DAV:)'. (/svn/centera_web/trunk/cgi-bin/wiki.pl)
So, how to I get a file in my wc (which is at rev 48) back to the
file I had in rev 35? :)
Thanks,
--
Seeya,
Paul
--
Key fingerprint = 1660 FECC 5D21 D286 F853 E808 BB07 9239 53F1 28EE
It may look like I'm just sitting here doing nothing,
but I'm really actively waiting for all my problems to go away.
If you're not having fun, you're not doing it right!
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: checking out an old rev?
Posted by Ben Collins-Sussman <su...@collab.net>.
Paul Lussier <pl...@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
Re: checking out an old rev?
Posted by Paul Lussier <pl...@lanminds.com>.
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.
--
Seeya,
Paul
--
Key fingerprint = 1660 FECC 5D21 D286 F853 E808 BB07 9239 53F1 28EE
It may look like I'm just sitting here doing nothing,
but I'm really actively waiting for all my problems to go away.
If you're not having fun, you're not doing it right!
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: checking out an old rev?
Posted by Ben Collins-Sussman <su...@collab.net>.
pll@lanminds.com writes:
> Hi,
>
> 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:
'svn checkout' only works on directories, not file.
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.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: checking out an old rev?
Posted by Tobias Ringstrom <to...@ringstrom.mine.nu>.
On 14 Mar 2003, Ben Collins-Sussman wrote:
> The only error here is a UI that could be more friendly. This is
> issue #785, and Brian Denny just submitted a patch to fix it. It will
> be applied to /trunk very soon!
Great!
/Tobias
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: checking out an old rev?
Posted by Ben Collins-Sussman <su...@collab.net>.
Tobias Ringstrom <to...@ringstrom.mine.nu> writes:
> pll@lanminds.com wrote:
>
> >I've tried merge, but I think I'm screwing that up too:
> >
> > svn merge -r 35:48 ./wiki.pl .
> > svn: RA layer request failed
> > svn: REPORT request failed on /svn/centera_web/trunk/cgi-bin/wiki.pl
> > svn: The REPORT request returned invalid XML in the response: Unknown XML\
> > element `error (in DAV:)'. (/svn/centera_web/trunk/cgi-bin/wiki.pl)
> >
> > So, how to I get a file in my wc (which is at rev 48) back to the
> > file I had in rev 35? :)
> >
> I think this is the same problem I had yesterday. Basically you cannot do
>
> svn merge -r 35:48 wiki.pl
>
> but you have to do
>
> svn merge -r 35:48 wiki.pl wiki.pl
>
> Is that a bug?
Technically, it's not a bug. The UI for merge has *always* required
two sources and a target, either 3 files or 3 dirs. So in the broken
example, you're asking to merge the diffs between two files into an
implicit '.' target.... hence the error.
The only error here is a UI that could be more friendly. This is
issue #785, and Brian Denny just submitted a patch to fix it. It will
be applied to /trunk very soon!
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: checking out an old rev?
Posted by Tobias Ringstrom <to...@ringstrom.mine.nu>.
pll@lanminds.com wrote:
>I've tried merge, but I think I'm screwing that up too:
>
> svn merge -r 35:48 ./wiki.pl .
> svn: RA layer request failed
> svn: REPORT request failed on /svn/centera_web/trunk/cgi-bin/wiki.pl
> svn: The REPORT request returned invalid XML in the response: Unknown XML\
> element `error (in DAV:)'. (/svn/centera_web/trunk/cgi-bin/wiki.pl)
>
>So, how to I get a file in my wc (which is at rev 48) back to the
>file I had in rev 35? :)
>
>
I think this is the same problem I had yesterday. Basically you cannot do
svn merge -r 35:48 wiki.pl
but you have to do
svn merge -r 35:48 wiki.pl wiki.pl
Is that a bug?
With regards to you original problem, if you need to (temporarily)
switch to an older revision of a file you can use update:
svn update -r 35 wiki.pl
Note that the revision is not sticky as in CVS, co a "svn update" in the
current directory or a parent directory will revert to HEAD.
/Tobias
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org