You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@subversion.apache.org by ju...@apache.org on 2012/03/09 16:47:14 UTC

svn commit: r1298887 - /subversion/branches/reintegrate-keep-alive/subversion/libsvn_client/merge.c

Author: julianfoad
Date: Fri Mar  9 15:47:14 2012
New Revision: 1298887

URL: http://svn.apache.org/viewvc?rev=1298887&view=rev
Log:
On the 'reintegrate-keep-alive' branch: Add a comment noting that the initial
    commit on this branch was ineffective.

* subversion/libsvn_client/merge.c
  (do_directory_merge): Note that the new code is never executed.

Modified:
    subversion/branches/reintegrate-keep-alive/subversion/libsvn_client/merge.c

Modified: subversion/branches/reintegrate-keep-alive/subversion/libsvn_client/merge.c
URL: http://svn.apache.org/viewvc/subversion/branches/reintegrate-keep-alive/subversion/libsvn_client/merge.c?rev=1298887&r1=1298886&r2=1298887&view=diff
==============================================================================
--- subversion/branches/reintegrate-keep-alive/subversion/libsvn_client/merge.c (original)
+++ subversion/branches/reintegrate-keep-alive/subversion/libsvn_client/merge.c Fri Mar  9 15:47:14 2012
@@ -9286,6 +9286,7 @@ do_directory_merge(svn_mergeinfo_catalog
 
       /* Don't merge any revision that represents a reflected merge (a merge
          of a change that was earlier merged *from* the current target). */
+      /* ### WILL NEVER EXECUTE -- outer "if" contradicts this one */
       if (merge_b->reintegrate_merge)
         {
           SVN_ERR(get_full_mergeinfo(