[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Quick abspath assertion in reintegrate merge

From: Daniel Shahaf <danielsh_at_elego.de>
Date: Fri, 29 Jul 2011 01:44:37 +0300

Daniel Shahaf wrote on Fri, Jul 29, 2011 at 00:23:38 +0300:
> [[[
> % cd wc1/trunk/
> % $svn cp -q A A2
> % $svn ci -q -mbr
> % echo >>A2/mu
> % $svn ci -q -mmod
> % cd A
> % $svn merge --reintegrate ../A2
> subversion/libsvn_wc/wc_db.c:6685: (apr_err=235000)
> svn: E235000: In file 'subversion/libsvn_wc/wc_db.c' line 6685: assertion failed (svn_dirent_is_absolute(local_abspath))
> zsh: abort $SVN merge --reintegrate ../A2
> %
> ]]]

In subversion/libsvn_client/merge.c:

[[[
10656 SVN_ERR(svn_client__get_revision_number(&rev2, NULL, ctx->wc_ctx,
10657 "",
10658 source_ra_session, peg_revision,
10659 scratch_pool));
]]]

we pass "" to the LOCAL_ABSPATH parameter.
Received on 2011-07-29 00:46:06 CEST

This is an archived mail posted to the Subversion Dev mailing list.