SVN 1.8.8: assertion failed (move_src_op_root_relpath != NULL && move_dst_op_root_relpath != NULL)

Hi Subversion developers,

Encountered the following assertion while trying to resolve a tree conflict:

svn: E235000: In file 'subversion/libsvn_wc/wc_db_update_move.c' line 2462:
assertion failed (move_src_op_root_relpath != NULL && move_dst_op_root_relpath
!= NULL)
./svn-bug.sh: line 33: 30387 Aborted (core dumped) svn
resolved -R dir2

Environment: RHEL6, x86_64, Subversion 1.8.8 RPM from WanDisco.

svn, version 1.8.8 (r1568071)
   compiled Feb 17 2014, 18:16:33 on x86_64-unknown-linux-gnu

Copyright (C) 2013 The Apache Software Foundation.
This software consists of contributions made by many people;
see the NOTICE file for more information.
Subversion is open source software, see http://subversion.apache.org/

The following repository access (RA) modules are available:

* ra_svn : Module for accessing a repository using the svn network protocol.
  - with Cyrus SASL authentication
  - handles 'svn' scheme
* ra_local : Module for accessing a repository on local disk.
  - handles 'file' scheme
* ra_serf : Module for accessing a repository via WebDAV protocol using serf.
  - using serf 1.3.2
  - handles 'http' scheme
  - handles 'https' scheme

Reproduction script:
[[[
#!/bin/bash -x

repo=/tmp/repo
url=file://$repo
wc1=/tmp/wc1
wc2=/tmp/wc2

# Create initial set-up
rm -rf $repo $wc1 $wc2
svnadmin create $repo
svn co $url $wc1
cd $wc1
svn mkdir dir1 dir2
echo hi > dir1/file1
echo lo > dir2/file2
svn add dir1/file1 dir2/file2
svn ci -m "Create initial layout"
svn up

# Prepare local changes in WC #1
svn mv dir2/file2 dir1/file2
svn rm --force dir2

# Make conflicting changes in WC #2
svn co $url $wc2
cd $wc2
echo more >> dir2/file2
svn ci -m "Modify dir2"

# Try to merge in WC #1
cd $wc1
svn up --accept=mc
svn resolved -R dir2
]]]

Regards,
Alexey.
Received on 2014-04-16 00:53:27 CEST