subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From danie...@apache.org
Subject svn commit: r1161467 - /subversion/trunk/subversion/include/svn_wc.h
Date Thu, 25 Aug 2011 09:37:02 GMT
Author: danielsh
Date: Thu Aug 25 09:37:02 2011
New Revision: 1161467

URL: http://svn.apache.org/viewvc?rev=1161467&view=rev
Log:
* subversion/include/svn_wc.h
  (svn_wc_merge4): Document another rationale for a behaviour.

Modified:
    subversion/trunk/subversion/include/svn_wc.h

Modified: subversion/trunk/subversion/include/svn_wc.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_wc.h?rev=1161467&r1=1161466&r2=1161467&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_wc.h (original)
+++ subversion/trunk/subversion/include/svn_wc.h Thu Aug 25 09:37:02 2011
@@ -6534,7 +6534,8 @@ typedef enum svn_wc_merge_outcome_t
  * control, then set @a *merge_outcome to #svn_wc_merge_no_merge and
  * return success without merging anything.  (The reasoning is that if
  * the file is not versioned, then it is probably unrelated to the
- * changes being considered, so they should not be merged into it.)
+ * changes being considered, so they should not be merged into it.
+ * Furtheremore, merging into an unversioned file is a lossy operation.)
  *
  * @a dry_run determines whether the working copy is modified.  When it
  * is @c FALSE the merge will cause @a target_abspath to be modified, when



Mime
View raw message