[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-20 10:58:40 CEST

Hi Ben,

had no time to switch on my computer at home during the weekend. Sorry for
the delay.

> > 1) Do a checkout and then merge of my repository data. That
> That doesn't help me reproduce the bug, because I don't have access to
> your repository. :-)
Bad news, I won't be allowed to give external access to our repository.

> > 2) I'll try to recreate the problem starting with a blank
> repository, but
> That would be great! Or, just give me access to your repository.
Good news, I could reproduce the crash with a small repository (8
revisions). I can mail you the repository (74KByte) if you like.

Here are the steps:
(That's what I did to reproduce the crash. I think it can be narrowed down
to fewer steps, because I think the crash is caused by the file type

1) import trunk tag branches into a blank repository
2) create some stuff in trunk and commit
3) create a copy of trunk in branches (Revision #3)
4) do a checkout of the copy in branches into a separate dir: ~/test/branch
5) modify stuff in trunk and commit
6) create a subdirectory in ~/test/branch and commit
7) create a binary file (bitmap) inside this subdir and commit

--- Begin Sidenote ---
Until now a svn merge -rN:M http://branch works (tried it after steps 5-7)
The merge command is always started in the working copy of branches, like:
~/test/branch>svn merge -r3:HEAD http://server/repos/branches/testbranch
--- End Sidenote ---

8) copy a dll into the subdir and commit.

~/test/branch>svn merge -r3:8 http://server/repos/branches/testbranch
A subdir

It looks like this special file/type causes the crash. The crash occurs with
the linux and windows cl client (tortoisesvn as well).
Hope that helps. If you need the repository, drop me a mail and I'll send it
to you.


To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Oct 20 10:59:33 2003

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.