Re: svn commit: rev 1881 - trunk/subversion/clients/cmdline

On Sun, May 05, 2002 at 08:58:42PM -0500, rooneg@tigris.org wrote:
> Author: rooneg
> Date: 2002-05-06 01:58 GMT
> New Revision: 1881
>
> Modified:
> trunk/subversion/clients/cmdline/trace-update.c
> Log:
> Fix a segfault i found when playing with svn merge.
>
> * subversion/clients/cmdline/trace-update.c
> (close_file): be sure entry is non-null before we dereference it.

this fixes the segfault i was seeing, but there's still a problem.

run the following command in the top level of a checked out svn tree:

./subversion/clients/cmdline/svn merge -r1879:1878 packages/freebsd/subversion/files packages/freebsd/subversion/files

it seems that the final wc directory argument isn't being honored
everywhere. if you look at what is printed out (at least after the
patch to fix the segfault ;-), it looks like it's readding two patches
that were removed from packages/freebsd/subversion/files in rev 1879,
but when the merge is finished, the two files have actually been added
to the top dir in the tree, so it looks like we're still using '.' for
a directory somewhere when we should be using
packages/freebsd/subversion/files.

i don't have time to look at this closely, but i imagine it won't be a
hard fix for someone who knows how the merge code works. if nobody
finds the problem by tomorrow, i'll file an issue on this.

thanks,

-garrett

-- 
garrett rooney                    Remember, any design flaw you're 
rooneg@electricjellyfish.net      sufficiently snide about becomes  
http://electricjellyfish.net/     a feature.       -- Dan Sugalski
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org