Hi Ryan,
Many thanks for the quick reply.
Ryan Schmidt wrote:
> On Jun 4, 2007, at 16:56, Phil Endecott wrote:
>
>> I tried to commit changes to three files:
>>
>> - OMakefile has changes.
>> - WorldView.cc has changes.
>> - WorldView_photos.cc is an 'svn copy' of WorldView.cc, with
>> further changes.
>>
>> The commit failed:
>>
>> $ svn commit -m"Split out WorldView_photos"
>> Sending src/OMakefile
>> Sending src/WorldView.cc
>> Adding src/WorldView_photos.cc
>> Transmitting file data ...svn: Commit failed (details follow):
>> svn: MERGE request failed on '/pictureframe/trunk/src'
>> svn: MERGE of '/pictureframe/trunk/src': Could not read status
>> line: Connection reset by peer (http://svn.chezphil.org)
>>
>>
>> I don't blame Subversion for this; on investigation it turned out
>> that the server had an enormous load average due to someone trying
>> to spam / hack a PHP forum. They weren't succeeding, but Apache
>> was obviously working hard to defeat them. I waited a bit for the
>> load to come back down and tried again:
>>
>> $ svn commit -m"Split out WorldView_photos"
>> Sending src/OMakefile
>> svn: Commit failed (details follow):
>> svn: Your file or directory 'OMakefile' is probably out-of-date
>> svn: The version resource does not correspond to the resource
>> within the transaction. Either the requested version resource is
>> out of date (needs to be updated), or the requested version
>> resource is newer than the transaction root (restart the commit).
>
> The commit succeeded, but your working copy doesn't think it did.
> Simply remove WorldView_photos.cc from your working copy and "svn
> update" again. Subversion will pull that file down from the
> repository server again and your working copy will be up to date.
> Your work is committed.
$ mv WorldView_photos.cc WorldView_photos.cc.ok
$ svn update
svn: Failed to add file 'WorldView_photos.cc': object of the same name
is already scheduled for addition
(Hmm, when you wrote "remove", did you mean "rm" or "svn rm" or
something else?)
Phil.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Jun 5 00:57:35 2007