[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Exception: libsvn_wc\update_editor.c line 1550: assertion failed (action == svn_wc_conflict_action_delete)

From: Bert Huijben <bert_at_qqmail.nl>
Date: Sun, 15 Mar 2015 10:08:00 +0000

Yes, we probably should.


The problem here is an editor that drives a file or directory add in a location that already has a BASE (‘status normal’) node. That should never happen, because the reporter just told the server that this node is there).


But github only uses some bits of the reporter state. (It doesn’t fully support clients that have mixed revision, potentially switched, sparse and in this case incomplete working copies. The incomplete is not the root problem here. The problem is not using the reporter state)






Bert




Sent from Windows Mail





From: Ivan Zhakov
Sent: ‎Sunday‎, ‎March‎ ‎15‎, ‎2015 ‎9‎:‎09‎ ‎AM
To: Bert Huijben
Cc: 'Yaroslav Panych', 'subversion'





On 14 March 2015 at 22:57, Bert Huijben <bert_at_qqmail.nl> wrote:
> Hi,
>
> Thanks for noting that this is related to the github implementation.
>
> When Subversion recovers from an so called ‘incomplete’ update, it sends
> other information to the server, but the github Subversion compatibility
> code doesn’t properly implement this recovery code path. (Their server also
> has problems handling sparse working copies… something that is not possible
> in plain git)
>
>
>
> There is not much we can do here in Subversion, as this is technically a
> protocol violation. But if github needs more information for fixing this
> please let them contact me.
>
>
Hi Bert,

I didn't look to the code, but is it possible to replace assertion
with some error message for this case?


--
Ivan Zhakov
Received on 2015-03-15 11:17:01 CET

This is an archived mail posted to the Subversion Users mailing list.