[svk-users] RA layer request failed - 404 Not Found
William McKee
william at knowmad.com
Sun Nov 25 21:59:34 EST 2007
Hi,
I'm getting the following error when trying to push local repository
changes up to my subversion repository:
-------------------------------------------------------------------
===> Auto-merging (9660, 9661) /local/knowmad/trunk to
/mirror/knowmad/trunk (base /mirror/knowmad/trunk:9659).
Merging back to mirror source https://mydomain.com/svn/knowmad.
RA layer request failed: COPY of clients/pwim/pwim-313 signoff letter.odt: 404 Not Found (https://mydomain.com)
Please sync mirrored path /mirror/knowmad/trunk first.
-------------------------------------------------------------------
I've tried synching which did not help. Here's the log of changes for
those revisions:
----------------------------------------------------------------------
r9660: william | 2007-10-30 01:22:37 -0400
Changed paths:
M /local/knowmad/trunk
M /local/knowmad/trunk/clients/pwim/pwim-103 signoff letter.odt
M /local/knowmad/trunk/financial/services/Webhosting_contracts.ods
----------------------------------------------------------------------
r9661: william | 2007-10-30 01:50:38 -0400
Changed paths:
R /local/knowmad/trunk/clients/pwim/pwim-103 signoff letter.odt (from
/local/knowmad/trunk/clients/pwim/pwim-103 signoff letter.odt:9490)
* Fix merges
----------------------------------------------------------------------
It looks like the problem is that 9660 made changes to the file then
9661 removed the file. Is this a known problem? Is there a way to undo
rev 9661 so that I can push my changes up to the subversion repository?
If not, how can I resolve this conflict so that I can get my local
updates posted?
Thanks,
William
--
Knowmad Technologies - Web Site Development & Automation
W: http://www.knowmad.com | E: william at knowmad.com
P: 704.343.9330 | http://www.LinkedIn.com/in/williammckee
More information about the svk-users
mailing list