Senthil Kumaran S <senthil_at_collab.net> writes:
> The complete patch with all the modifications as a result of review
> from arfrever and stsp is given as attachment here
> http://subversion.tigris.org/servlets/ReadMsg?list=dev&msgNo=139442
Senthil, I hate to do this to you, but: the patch doesn't apply cleanly
on trunk (see below); could you repost an updated (if necessary)
version, this time as a 'text/plain' attachment? Or else just attach it
to issue #2489. I'd love to review this (and commit!), but it's much
easier to do review by applying to trunk and then looking at the change
in context.
Maybe the patch was mangled because it was inline in your email, or
maybe it just doesn't apply cleanly to trunk anymore due to code
changes.
See below for what happened when I tried to apply to r31953 of trunk.
Thanks,
-Karl
$ patch -p0 < carefully_cleaned_up_patch_file
patching file subversion/libsvn_ra/ra_loader.c
patching file subversion/libsvn_subr/config_file.c
patching file subversion/libsvn_subr/cmdline.c
Hunk #1 FAILED at 355.
Hunk #2 FAILED at 373.
Hunk #3 FAILED at 383.
Hunk #4 FAILED at 476.
Hunk #5 FAILED at 493.
Hunk #6 succeeded at 506 (offset -2 lines).
Hunk #7 succeeded at 529 (offset -2 lines).
5 out of 7 hunks FAILED -- saving rejects to file subversion/libsvn_subr/cmdline.c.rej
patching file subversion/libsvn_subr/ssl_client_cert_pw_providers.c
patching file subversion/libsvn_subr/prompt.c
Hunk #1 FAILED at 379.
Hunk #2 succeeded at 438 (offset 7 lines).
1 out of 2 hunks FAILED -- saving rejects to file subversion/libsvn_subr/prompt.c.rej
patching file subversion/libsvn_auth_gnome_keyring/gnome_keyring.c
patching file subversion/include/svn_config.h
patching file subversion/include/svn_auth_dso.h
patching file subversion/include/svn_cmdline.h
patching file subversion/include/private/svn_auth_private.h
patching file subversion/include/svn_auth.h
patching file subversion/libsvn_ra_neon/session.c
$
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-07-01 21:04:08 CEST