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

2015-03-16 Thread Daniel Shahaf
Bert Huijben wrote on Sun, Mar 15, 2015 at 10:08:00 +: Yes, we probably should. Looks like you just did, in r1666832. Thanks. Nominate it for backport? % nominate.pl r1666832 Resolves an assertion :-) Daniel The problem here is an editor that drives a file or directory add in a

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

2015-03-15 Thread Ivan Zhakov
On 14 March 2015 at 22:57, Bert Huijben b...@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

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

2015-03-15 Thread Bert Huijben
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

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

2015-03-14 Thread Bert Huijben
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