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

Re: 1.8 bug(?): svn:mergeinfo set for tree-conflicted files in subdirs

2015-03-14 Thread Pete Harlan
On Sat, Mar 14, 2015 at 7:45 AM, Bert Huijben b...@qqmail.nl wrote: Looking further (after turning your test in a regression test), I think this shows another problem. The conflict is on 'dir', not really on file. But (for legacy reasons) we somehow think that conflicting directory adds are

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

2015-03-14 Thread Yaroslav Panych
Hello devs. Got Tsvn exception while updating repository frim github ( https://github.com/cplussharp/graph-studio-next/) Actually it happens if initial checkout from repo was canceled by user(for some reason) and then(after cleanup command) user initiated update command. If checkout perforemed to

RE: 1.8 bug(?): svn:mergeinfo set for tree-conflicted files in subdirs

2015-03-14 Thread Bert Huijben
[CC-ing two Subversion developers that might have more input on this... I'm not a merge expert :-)] -Original Message- From: Pete Harlan [mailto:pchpubli...@gmail.com] Sent: zaterdag 14 maart 2015 02:45 To: Bert Huijben Cc: subversion Subject: Re: 1.8 bug(?): svn:mergeinfo set for

RE: 1.8 bug(?): svn:mergeinfo set for tree-conflicted files in subdirs

2015-03-14 Thread Bert Huijben
-Original Message- From: Bert Huijben [mailto:b...@qqmail.nl] Sent: zaterdag 14 maart 2015 13:06 To: 'Pete Harlan' Cc: 'subversion'; pbu...@collab.net; 'Julian Foad' Subject: RE: 1.8 bug(?): svn:mergeinfo set for tree-conflicted files in subdirs [CC-ing two Subversion