Re: svn merge segfaults

Lübbe Onken <l.onken@rac.de> writes:

> 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.

That doesn't help me reproduce the bug, because I don't have access to
your repository. :-)

> 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.

That would be great! Or, just give me access to your repository.

>
> > 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.

Why? Sometimes it's totally legitimate for source and target to be
the same URL. Suppose you have a working copy of trunk, and you're
simply trying to undo a commit you just made:

   svn merge -r HEAD:HEAD-1 http://repos/trunk

> > 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.

It should be trivial to fix, once we can reproduce the problem.

---------------------------------------------------------------------
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:41:47 2003