Re: libsvn_ra_svn\marshal.c line 486: assertion failed (opt || cstr)

Stefan Sperling wrote:
> + svn st issue-3485/trunk2
> A + issue-3485/trunk2/alpha
>
> Usually, people would commit at this point.

Or people would revert the file, if their intention is to say
resolved-using-theirs, or "they are right, deleting the crummy file is a
better idea than repairing it". From your description, I gather at this stage
"revert" works fine even instead of resolving. In the context of an update,
"revert" = "resolve-using-theirs". Except that it leaves an unversioned file
behind, in the case you edited it and they deleted it, but that's quite all
right.

However, if instead of this conflict, working had scheduled an add, and the
updates include an add of the same file, then a revert currently leaves some
poo behind.

-- 
Stein Somers
Principal Software Engineer, Optical Solutions
OPNET Technologies bvba http://www.opnet.com/
Franklin Rooseveltlaan 348 W, B-9000 Gent, Belgium
skype: steinsomers
phone: +32 92 65 02 41 (indirect and only 9AM-5PM WET)
fax:   +32 92 65 02 17
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2395407
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].