On Thu, Aug 25, 2011 at 11:51:33AM +0200, Erik Faye-Lund wrote:
> On Wed, Aug 24, 2011 at 5:01 PM, Stefan Sperling <stsp_at_elego.de> wrote:
> > On Wed, Aug 24, 2011 at 03:12:04PM +0200, Erik Faye-Lund wrote:
> >> In file
> >> 'D:\Development\SVN\Releases\TortoiseSVN-1.7-beta2\ext\subversion\subversion\libsvn_wc\update_editor.c'
> >> line 1582: assertion failed (action == svn_wc_conflict_action_edit || action
> >> == svn_wc_conflict_action_delete || action == svn_wc_conflict_action_replace)
> >> ---------------------------
> >> OK
> >> ---------------------------
> >> ---8<---
> >>
> >> I don't know the code-base, but my knee-jerk instinct was that I did
> >> have local modifications in some of the files; luckily these were pure
> >> throw-away things. So after a clean-up and revert I updated again, and
> >> everything seems to be in order again.
> >
> > This is definitely something related to tree conflicts.
> > You must have had a locally edited, deleted, or replaced node.
> > The incoming change was something other than an edit, delete,
> > or replace.
>
> But shouldn't that have been solved by a revert in that case? Because
> it still triggers when I revert and re-update here...
The assertion means that the client thinks the server is sending
nonsense. This might be a bug where the client makes an invalid
assumption about compatibility of the local working copy state with
incoming changes.
Does it also happen in a separate, fresh checkout of the revision
the containing directory of this file (or the file itself) is at?
Does it also happen with the command line client (if you have one
available)?
> > If you can still manage to produce a reproduction recipe based on this
> > information please share it! Thanks.
>
> Unfortunately, the repo is proprietary, and I don't know how I can
> re-create the issue outside of my corporate setup...
If you can share the wc.db file from your working copy
privately you can send it to me off-list.
There is no file content in wc.db, only path names and svn: properties.
I won't share any of the data with anyone.
Received on 2011-08-25 18:02:52 CEST