kfogel_at_tigris.org wrote on Wed, 30 Apr 2008 at 15:17 -0700:
> Author: kfogel
> Date: Wed Apr 30 15:17:59 2008
> New Revision: 30873
>
> Log:
> * STATUS: Add a note about r30868, following chat with epg.
>
> Modified:
> branches/1.5.x/STATUS
>
> Modified: branches/1.5.x/STATUS
> URL: http://svn.collab.net/viewvc/svn/branches/1.5.x/STATUS?pathrev=30873&r1=30872&r2=30873
> ==============================================================================
> --- branches/1.5.x/STATUS Wed Apr 30 15:03:37 2008 (r30872)
> +++ branches/1.5.x/STATUS Wed Apr 30 15:17:59 2008 (r30873)
> @@ -34,6 +34,11 @@ Candidate changes:
> Justification:
> Don't error over svn+ssh:// when the user can't read passwd.
> One-line change.
> + Notes: epg points out that this may not apply cleanly due to
> + svnserve logging changes on trunk. The necessary adjustments
> + should be trivial / non-controversial, but as epg's logging
> + changes involved some block rearrangement, the merge adjustments
> + will be textually larger than one might expect. Caveat Codor.
> Votes:
> +1: danielsh, kfogel
>
Oops. This time I forgot to test merging r30868 before nominating it
(sorry), but now I tried, and it aborts over ra_serf:
0:15x% svn info | grep URL
URL: https://svn.collab.net/repos/svn/branches/1.5.x
0:15x% svnversion
30876
0:15x% ../trunk/subversion/svn/svn merge -c 30868 ../trunk .
zsh: abort ../trunk/subversion/svn/svn merge -c 30868 ../trunk .
134:15x%
(gdb) bt
#0 0xffffe410 in __kernel_vsyscall ()
#1 0xb7ae5ef5 in raise () from /lib/i686/cmov/libc.so.6
#2 0xb7ae7871 in abort () from /lib/i686/cmov/libc.so.6
#3 0xb7a0a064 in serf_bucket_mem_free (allocator=0x80cca48, block=0x1781) at buckets/allocator.c:228
#4 0xb7a0891c in serf_default_destroy_and_data (bucket=0x8224f58) at buckets/buckets.c:117
#5 0xb7a06b3f in serf_aggregate_destroy_and_data (bucket=0x8224f58) at buckets/aggregate_buckets.c:75
#6 0xb7a0c30b in serf_chunk_destroy (bucket=0x80a1430) at buckets/chunk_buckets.c:220
#7 0xb7a069f1 in cleanup_aggregate (ctx=0x80a1030, allocator=0x81dcad0) at buckets/aggregate_buckets.c:43
#8 0xb7a06b34 in serf_aggregate_destroy_and_data (bucket=0x80a0b30) at buckets/aggregate_buckets.c:73
#9 0xb7a0af58 in serf_ssl_encrypt_destroy_and_data (bucket=0x80a0db0) at buckets/ssl_buckets.c:976
#10 0xb7a08098 in serf_context_run (ctx=0x80ccae0, duration=2000000000, pool=0x81fd940) at context.c:652
...
(gdb)
Using serf 0.1.2.
Daniel
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-05-01 08:22:19 CEST