subversion-users mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Daniel Shahaf <...@daniel.shahaf.name>
Subject Re: Exception: libsvn_wc\update_editor.c line 1550: assertion failed (action == svn_wc_conflict_action_delete)
Date Mon, 16 Mar 2015 09:43:50 GMT
Bert Huijben wrote on Sun, Mar 15, 2015 at 10:08:00 +0000:
> 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 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@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

Mime
View raw message