You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by François Beausoleil <fb...@users.sourceforge.net> on 2003/07/30 19:38:03 UTC

Reverse merge results in HTTP 404 error on WinXP SP1

Hello everyone,

My repository is laid out like this:
rac/
    calendar/
       trunk/
          lib/
             jta.jar

The jta.jar file was added at r135, and then removed at r141.  Now, I 
want to get it back.  So, I tried the following:
D:\java\calendar\lib>svn --version
svn, version 0.25.0 (r6433)
    compiled Jul 10 2003, 22:05:10
[snip]

D:\java\calendar\lib>svn info
Path:
Url: http://svn.hopto.org:8193/repos/rac/calendar/trunk/lib
[snip]

D:\java\calendar\lib>svn merge -r141:140 .
svn: RA layer request failed
svn: PROPFIND request failed on 
'http://svn.hopto.org:8193/repos/rac/calendar/trunk/lib/jta.jar'
svn: PROPFIND of 
'http://svn.hopto.org:8193/repos/rac/calendar/trunk/lib/jta.jar': 404 
Not Found (http://svn.hopto.org:8193)

D:\java\calendar\lib>svn merge -r141:140 
http://svn.hopto.org:8193/repos/rac/calendar/trunk/lib
svn: RA layer request failed
svn: PROPFIND request failed on 
'http://svn.hopto.org:8193/repos/rac/calendar/trunk/lib/jta.jar'
svn: PROPFIND of 
'http://svn.hopto.org:8193/repos/rac/calendar/trunk/lib/jta.jar': 404 
Not Found (http://svn.hopto.org:8193)

D:\java\calendar\lib>svn merge 
http://svn.hopto.org:8193/repos/rac/calendar/trunk/lib@141 
http://svn.hopto.org:8193/repos/rac/calendar/trunk/lib@140
svn: RA layer request failed
svn: PROPFIND request failed on 
'http://svn.hopto.org:8193/repos/rac/calendar/trunk/lib/jta.jar'
svn: PROPFIND of 
'http://svn.hopto.org:8193/repos/rac/calendar/trunk/lib/jta.jar': 404 
Not Found (http://svn.hopto.org:8193)

This is a binary file, if that is important.

I reread http://svnbook.red-bean.com/html-chunk/ch04s04.html, just to 
make sure I did not miss anything, and the example is correct, if the 
file still exists.  If the file does not exist anymore, does that change 
anything ?

So, where did I go wrong ?

Thanks !
François Beausoleil


---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org

Re: Reverse merge results in HTTP 404 error on WinXP SP1

Posted by Ben Collins-Sussman <su...@collab.net>.
kfogel@collab.net writes:

> François Beausoleil <fb...@users.sourceforge.net> writes:
> > >>So, where did I go wrong ?
> > > You're using an old client, I suspect.  This bug was fixed in svn
> > > 0.26.
> > >
> > Yes, I use 0.25.0, which I pointed out in my mail.  I am waiting for a
> > pre-compiled binary to upgrade.
> > 
> > Thanks !
> 
> You could also just restore the file using 'svn cp URL WC-PATH', maybe?

This is exactly the command his 'svn merge' is running, and exactly
the bug that was fixed in 0.26.   :-)

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org


Re: Reverse merge results in HTTP 404 error on WinXP SP1

Posted by kf...@collab.net.
François Beausoleil <fb...@users.sourceforge.net> writes:
> >>So, where did I go wrong ?
> > You're using an old client, I suspect.  This bug was fixed in svn
> > 0.26.
> >
> Yes, I use 0.25.0, which I pointed out in my mail.  I am waiting for a
> pre-compiled binary to upgrade.
> 
> Thanks !

You could also just restore the file using 'svn cp URL WC-PATH', maybe?

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org


Re: Reverse merge results in HTTP 404 error on WinXP SP1

Posted by François Beausoleil <fb...@users.sourceforge.net>.
Ben Collins-Sussman wrote:

> François Beausoleil <fb...@users.sourceforge.net> writes:
> 
> 
>>So, where did I go wrong ?
> 
> 
> You're using an old client, I suspect.  This bug was fixed in svn 0.26.
> 
Yes, I use 0.25.0, which I pointed out in my mail.  I am waiting for a 
pre-compiled binary to upgrade.

Thanks !
François



---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org

Re: Reverse merge results in HTTP 404 error on WinXP SP1

Posted by Ben Collins-Sussman <su...@collab.net>.
François Beausoleil <fb...@users.sourceforge.net> writes:

> So, where did I go wrong ?

You're using an old client, I suspect.  This bug was fixed in svn 0.26.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org