On 06/30/2015 11:26 AM, Stefan Sperling wrote:
On Mon, Jun 29, 2015 at 01:55:31PM +0200, Nikolas PATTAKOS wrote:
Hi,
I am running subversion version 1.8.13 (r1667537) on debian testing.
I have a number of svn move commands on my computer pending to be submitted
and I did an svn update to update my branch. This resulted in a number of
conflicts which I tried to resolve but faced this message:
Select: (mc) apply update to move destination, (p) postpone,
(q) quit resolution, (h) help: mc
svn: E235000: In file
'/build/subversion-OpCIfE/subversion-1.8.13/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)
Aborted
To me it looks like a subversion issue but I do not know what else to do.
Could you provide a script that shows which sequence of move commands
got you into this situation?
Hi,
My project's dir structure included :
lib/
src/TestA
src/TestB
src/...
and I changed it to
lib/Tests/A
lib/Tests/B
src/..
I am pulling updates before submitting my changes and I asked svn to
apply updates to move destination but then I get this error. I got one
again today:
svn update
Updating '.':
C src/TestCommunicationsDGPara
U src/TestCommunicationsDGPara/src/TestCommunicationsDGPara.cpp
U src/TestCommunicationsDGPara/src
Updated to revision 1644.
Tree conflict on 'src/TestCommunicationsDGPara'
> local dir moved away, incoming dir edit upon update
Select: (mc) apply update to move destination, (p) postpone,
(q) quit resolution, (h) help: mc
svn: E235000: In file
'/build/subversion-OpCIfE/subversion-1.8.13/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)
Aborted
Then I tried svn cleanup, moved lib/Tests/CommunicationsDGPara to its
original location(by doing svn revert CommunicationsDGPAra) and svn
update. This resulted in my files being lost, ie I could not see them
under lib/Tests/ nor src/ .
I do not know what is wrong but I think that under no circumstances or
user mistake should a situation like this arise.
Regards,
Nikolas
--
--------------------------------------------------------------------------------
Nikolas Pattakos < nsp >
Service d'Expérimentation et de Développement, Inria Bordeaux Sud-Ouest
--------------------
A: Because it messes up the order in which people normally read text.
Q: Why is it such a bad thing?
A: Top-posting.
Q: What is the most annoying thing on usenet and in e-mail?
--------------------------------------------------------------------------------
