You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Daniel Shahaf <da...@elego.de> on 2011/07/28 23:23:38 UTC
Quick abspath assertion in reintegrate merge
[[[
% 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
%
]]]
Re: Quick abspath assertion in reintegrate merge
Posted by Stefan Sperling <st...@elego.de>.
On Fri, Jul 29, 2011 at 01:44:37AM +0300, Daniel Shahaf wrote:
> 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.
Has this been fixed? Should we file an issue?
Re: Quick abspath assertion in reintegrate merge
Posted by Daniel Shahaf <da...@elego.de>.
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.