You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by hw...@apache.org on 2011/07/18 15:44:00 UTC
svn commit: r1147877 - in /subversion/branches/1.7.x: ./ STATUS
subversion/svn/copy-cmd.c
Author: hwright
Date: Mon Jul 18 13:43:59 2011
New Revision: 1147877
URL: http://svn.apache.org/viewvc?rev=1147877&view=rev
Log:
Merge r1147293, r1147309 from trunk:
* r1147293, r1147309
Fix issue #3960 'URL-to-WC copy with --quiet segfaults'.
Justification:
Fixes a segfault.
Notes: r1147293 fixes the segfault. r1147309 fixes a similar
bug for WC-to-URL copies, albeit one which doesn't result in a
segfault.
Votes:
+1: pburba, danielsh, philip
Modified:
subversion/branches/1.7.x/ (props changed)
subversion/branches/1.7.x/STATUS
subversion/branches/1.7.x/subversion/svn/copy-cmd.c
Propchange: subversion/branches/1.7.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jul 18 13:43:59 2011
@@ -53,4 +53,4 @@
/subversion/branches/tree-conflicts:868291-873154
/subversion/branches/tree-conflicts-notify:873926-874008
/subversion/branches/uris-as-urls:1060426-1064427
-/subversion/trunk:1146013,1146219,1146222,1146274,1146492,1146555,1146620,1146684,1146781,1146832,1146834,1146899,1146904
+/subversion/trunk:1146013,1146219,1146222,1146274,1146492,1146555,1146620,1146684,1146781,1146832,1146834,1146899,1146904,1147293,1147309
Modified: subversion/branches/1.7.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1147877&r1=1147876&r2=1147877&view=diff
==============================================================================
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Mon Jul 18 13:43:59 2011
@@ -44,13 +44,3 @@ Candidate changes:
Approved changes:
=================
-
- * r1147293, r1147309
- Fix issue #3960 'URL-to-WC copy with --quiet segfaults'.
- Justification:
- Fixes a segfault.
- Notes: r1147293 fixes the segfault. r1147309 fixes a similar
- bug for WC-to-URL copies, albeit one which doesn't result in a
- segfault.
- Votes:
- +1: pburba, danielsh, philip
Modified: subversion/branches/1.7.x/subversion/svn/copy-cmd.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/svn/copy-cmd.c?rev=1147877&r1=1147876&r2=1147877&view=diff
==============================================================================
--- subversion/branches/1.7.x/subversion/svn/copy-cmd.c (original)
+++ subversion/branches/1.7.x/subversion/svn/copy-cmd.c Mon Jul 18 13:43:59 2011
@@ -95,12 +95,14 @@ svn_cl__copy(apr_getopt_t *os,
else if ((! srcs_are_urls) && (dst_is_url))
{
/* WC->URL : Use notification. */
+ if (! opt_state->quiet)
SVN_ERR(svn_cl__notifier_mark_wc_to_repos_copy(ctx->notify_baton2));
}
else if ((srcs_are_urls) && (! dst_is_url))
{
- /* URL->WC : Use checkout-style notification. */
- SVN_ERR(svn_cl__notifier_mark_checkout(ctx->notify_baton2));
+ /* URL->WC : Use checkout-style notification. */
+ if (! opt_state->quiet)
+ SVN_ERR(svn_cl__notifier_mark_checkout(ctx->notify_baton2));
}
else
{