subversion-users mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Stefan Sperling <s...@elego.de>
Subject Re: Version 1.7.12 - "conflict_action" issue when running Update
Date Tue, 09 Apr 2013 10:40:34 GMT
On Tue, Apr 09, 2013 at 09:54:44AM +0000, Andrew Newlands wrote:
> Hi,
> 
> We have searched mailing list archives but it is difficult to find any matches for this
problem.
> 
> Can you please advise on the following, which was generated by TSVN during an update
operation, initiated from the Windows Explorer context menu, with TSVN 1.7.12, 32-bit, under
Windows 7 (with latest win updates applied)....
> 
> "---------------------------
> Subversion Exception!
> ---------------------------
> Subversion encountered a serious problem.
> Please take the time to report this on the Subversion mailing list
> with as much information as possible about what
> you were trying to do.
> But please first search the mailing list archives for the error message
> to avoid reporting the same problem repeatedly.
> You can find the mailing list archives at
> http://subversion.apache.org/mailing-lists.html
> 
> Subversion reported the following
> (you can copy the content of this dialog
> to the clipboard using Ctrl-C):
> 
> In file
> 'D:\Development\SVN\Releases\TortoiseSVN-1.7.12\ext\subversion\subversion\libsvn_wc\update_editor.c'
> line 1587: assertion failed (action == svn_wc_conflict_action_edit || action
> == svn_wc_conflict_action_delete || action == svn_wc_conflict_action_replace)
> ---------------------------
> OK
> ---------------------------"
> 
> This is not much else we can tell you at this stage.  The UI, shows this...
> 
> Command: Update
> Updating: C:\DATA Britannic\Development - .NET\netPCI
> Error: In file
> Error:  'D:\Development\SVN\Releases\TortoiseSVN-1.7.12\ext\subversion\subversion\libsvn_wc\update_editor.c'
> Error:  line 1587: assertion failed (action == svn_wc_conflict_action_edit || action
> Error:  == svn_wc_conflict_action_delete || action == svn_wc_conflict_action_replace)
> Completed!:
> 

For some reason, the update you are running is trying to add a new
file or directory where there's an existing file or directory.

Subversion expects the file and directory in the working copy and
the one in the repository (which the update pulls changes from) to be
related to one another. The SVN client assumes that a new addition at
this path cannot make any sense, and only an edit, delete, or replacement
can happen. The assertion is supposed to catch the situation where an
addition is detected regardless, which is assumed to be a bug. Perhaps
the assertion is wrong, and it can trigger in situations where it isn't
supposed to trigger. I'm not quite sure.

It is unfortunate that the error message does not tell you which
file or directory is triggering the assertion. I will try to fix
this so that future versions of SVN will show the path in question.
However, you might be able to tell by looking at the update output.
The file or directory updated just before the assertion failure might provide
a hint as to which file or directory Subversion might try to update next.
Failing that, we'd have to resort to a debugger (assertions are really
meant to trigger on developer machines, rather than on user machines...)

If you can provide more information about the local working copy state
and repository history of this file or directory, that would help.
TortoiseSVN shows local state information in the 'Properties ->
Subversion' tab (I mean the generic Windows file properties, and
*not* TortoiseSVN -> Properties, which is about something else).
If you like you can also share your .svn/wc.db file (privately and
off-list if you prefer, since it contains information such as URLs
and path names), which would allow us to look up any relevant information
about the working copy state.

The history of the path can be viewed with 'TortoiseSVN -> Show log'.
Is there anything in the path's history that involves changes such
as additions or replacements, and are these changes within the range
of revisions the update is pulling changes from?

Mime
View raw message