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

RE: svn merge segfaults

From: Lübbe Onken <l.onken_at_rac.de>
Date: 2003-10-17 16:28:03 CEST

Ben wrote:

> > I can easily make svn merge segfault by doing the following:
> >
> > I've got two directories:
> > ~/trunk = checkout from http://repos/trunk
> > ~/branch = checkout from http://repos/branch
> >
> > I'm in ~/branch and do the following:
> > --- SNIP ---
> > lonken_at_ra:~/branch > svn merge -r 365:511 https://repos/branch
> > A exe
> > Segmentation fault
>
> So you're merging a bunch of branch-changes into the branch.
I did that by accident, because I didn't look where I was. I thought I was
in trunk :-)

> At most,
> you should get a bunch of conflicts due to redundancies. There should
> *never* be a segfault for any reason.
Maybe it's because svn merge is trying to add a directory that already
exists in branch. The crash occurs in strncmp, but that's all I can tell you
without doing some real debugging.
 
> What version of SVN is this?
Tag Version 0.31 compiled with VS.Net 2003

> Can you give us a *precise* recipe to reproduce?
1) Do a checkout and then merge of my repository data. That works 100% of
the time. Maybe I can arrange something on monday when my admins are there
to help.
2) I'll try to recreate the problem starting with a blank repository, but
that'll have to wait a bit, since I only got 5 minutes before I have to
leave. Maybe tonight at home.

> No, 'svn merge' isn't a "smart" command. It just applies tree-diffs
> to a working copy.
Yes, but the source=target case might be worth checking.

> If the user uses this command to apply a
> nonsensical patch to a tree, the worst thing that should happen is a
> bunch of conflicts or obstructions.
Yep, hopefully I can help you to hunt down this one.

Cheers
-Lübbe

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Oct 17 16:28:56 2003

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