Hi,

I was doing svn update. My source code has some files that I've moved. During 
the update
there was a conflict and I typed `mc' to apply update to move destination. 
After doing
that I got the following:

Tree conflict on 'run-time/scoop/private_queue.cpp'
   > local file moved away, incoming file edit upon update
Select: (mc) apply update to move destination, (p) postpone,
        (q) quit resolution, (h) help: mc
svn: E235000: In file
'/build/buildd/subversion-1.8.10/subversion/libsvn_wc/wc_db_update_move.c' line 
1039:
assertion failed (move_dst_revision == expected_move_dst_revision || status ==
svn_wc__db_status_not_present)
Abort (core dumped)

Before that file, I had other files and it worked fine. So I'm not sure what is 
the issue
exactly.

Regards,
Manu

Reply via email to