Index: subversion/libsvn_wc/props.c
===================================================================
--- subversion/libsvn_wc/props.c	(revision 40042)
+++ subversion/libsvn_wc/props.c	(working copy)
@@ -1059,6 +1059,7 @@
                       void *conflict_baton,
                       svn_cancel_func_t cancel_func,
                       void *cancel_baton,
+                      svn_boolean_t dry_run,
                       apr_pool_t *result_pool,
                       apr_pool_t *scratch_pool)
 
@@ -1092,16 +1093,20 @@
             }
           else
             {
-              SVN_ERR(maybe_generate_propconflict(&got_conflict, db,
-                                                  local_abspath,
-                                                  left_version, right_version,
-                                                  is_dir,
-                                                  propname, working_props,
-                                                  NULL, new_val,
-                                                  base_val, working_val,
-                                                  conflict_func, conflict_baton,
-                                                  cancel_func, cancel_baton,
-                                                  scratch_pool));
+              if(dry_run)
+	        got_conflict = TRUE;
+
+	      else
+	        SVN_ERR(maybe_generate_propconflict(&got_conflict, db,
+	                                            local_abspath,
+		                                    left_version, right_version,
+		                                    is_dir,
+		                                    propname, working_props,
+		                                    NULL, new_val,
+		                                    base_val, working_val,
+		                                    conflict_func, conflict_baton,
+		                                    cancel_func, cancel_baton,
+	                                            scratch_pool));
               if (got_conflict)
                 *conflict = svn_string_createf
                     (result_pool,
@@ -1113,14 +1118,18 @@
     }
   else if (base_val)
     {
-      SVN_ERR(maybe_generate_propconflict(&got_conflict, db, local_abspath,
-                                          left_version, right_version,
-                                          is_dir, propname,
-                                          working_props, NULL, new_val,
-                                          base_val, NULL,
-                                          conflict_func, conflict_baton,
-                                          cancel_func, cancel_baton,
-                                          scratch_pool));
+      if(dry_run)
+        got_conflict = TRUE;
+      
+      else
+        SVN_ERR(maybe_generate_propconflict(&got_conflict, db, local_abspath,
+		                            left_version, right_version,
+	                                    is_dir, propname,
+	                                    working_props, NULL, new_val,
+	                                    base_val, NULL,
+	                                    conflict_func, conflict_baton,
+		                            cancel_func, cancel_baton,
+		                            scratch_pool));
       if (got_conflict)
         *conflict = svn_string_createf
             (result_pool,
@@ -1169,6 +1178,7 @@
                          void *conflict_baton,
                          svn_cancel_func_t cancel_func,
                          void *cancel_baton,
+                         svn_boolean_t dry_run,
                          apr_pool_t *result_pool,
                          apr_pool_t *scratch_pool)
 {
@@ -1193,16 +1203,20 @@
              apr_hash_set(working_props, propname, APR_HASH_KEY_STRING, NULL);
            else
              {
-               SVN_ERR(maybe_generate_propconflict(&got_conflict, db,
-                                                   local_abspath,
-                                                   left_version, right_version,
-                                                   is_dir,
-                                                   propname, working_props,
-                                                   old_val, NULL,
-                                                   base_val, working_val,
-                                                   conflict_func, conflict_baton,
-                                                   cancel_func, cancel_baton,
-                                                   scratch_pool));
+	       if(dry_run)
+	         got_conflict = TRUE;
+	       
+	       else
+	         SVN_ERR(maybe_generate_propconflict(&got_conflict, db,
+			                             local_abspath,
+		                                     left_version, right_version,
+			                             is_dir,
+		                                     propname, working_props,
+		                                     old_val, NULL,
+		                                     base_val, working_val,
+		                                     conflict_func, conflict_baton,
+			                             cancel_func, cancel_baton,
+			                             scratch_pool));
                if (got_conflict)
                  *conflict = svn_string_createf
                      (result_pool,
@@ -1219,14 +1233,18 @@
 
   else
     {
-      SVN_ERR(maybe_generate_propconflict(&got_conflict, db, local_abspath,
-                                          left_version, right_version,
-                                          is_dir, propname,
-                                          working_props, old_val, NULL,
-                                          base_val, working_val,
-                                          conflict_func, conflict_baton,
-                                          cancel_func, cancel_baton,
-                                          scratch_pool));
+      if(dry_run)
+        got_conflict = TRUE;
+      
+      else
+        SVN_ERR(maybe_generate_propconflict(&got_conflict, db, local_abspath,
+		                            left_version, right_version,
+	                                    is_dir, propname,
+		                            working_props, old_val, NULL,
+	                                    base_val, working_val,
+	                                    conflict_func, conflict_baton,
+	                                    cancel_func, cancel_baton,
+		                            scratch_pool));
       if (got_conflict)
         *conflict = svn_string_createf
             (result_pool,
@@ -1263,6 +1281,7 @@
                                    void *conflict_baton,
                                    svn_cancel_func_t cancel_func,
                                    void *cancel_baton,
+	                           svn_boolean_t dry_run,
                                    apr_pool_t *result_pool,
                                    apr_pool_t *scratch_pool)
 {
@@ -1298,15 +1317,19 @@
 
       else
         {
-          /* There is a base_val but no working_val */
-          SVN_ERR(maybe_generate_propconflict(&got_conflict, db, local_abspath,
-                                              left_version, right_version,
-                                              is_dir, propname, working_props,
-                                              old_val, new_val,
-                                              base_val, working_val,
-                                              conflict_func, conflict_baton,
-                                              cancel_func, cancel_baton,
-                                              scratch_pool));
+	  if(dry_run)
+	    got_conflict = TRUE;
+
+	  else
+	    /* There is a base_val but no working_val */
+	    SVN_ERR(maybe_generate_propconflict(&got_conflict, db, local_abspath,
+			                        left_version, right_version,
+			                        is_dir, propname, working_props,
+			                        old_val, new_val,
+			                        base_val, working_val,
+			                        conflict_func, conflict_baton,
+			                        cancel_func, cancel_baton,
+			                        scratch_pool));
           if (got_conflict)
             *conflict = svn_string_createf
                 (result_pool,
@@ -1376,6 +1399,7 @@
                                  void *conflict_baton,
                                  svn_cancel_func_t cancel_func,
                                  void *cancel_baton,
+	                         svn_boolean_t dry_run,
                                  apr_pool_t *result_pool,
                                  apr_pool_t *scratch_pool)
 {
@@ -1393,15 +1417,19 @@
     }
   else
     {
-      /* Merge the change. */
-      SVN_ERR(maybe_generate_propconflict(&got_conflict, db, local_abspath,
-                                          left_version, right_version,
-                                          is_dir, propname, working_props,
-                                          old_val, new_val,
-                                          base_val, working_val,
-                                          conflict_func, conflict_baton,
-                                          cancel_func, cancel_baton,
-                                          scratch_pool));
+      if(dry_run)
+        got_conflict = TRUE;
+      
+      else
+        /* Merge the change. */
+        SVN_ERR(maybe_generate_propconflict(&got_conflict, db, local_abspath,
+		                            left_version, right_version,
+	                                    is_dir, propname, working_props,
+		                            old_val, new_val,
+	                                    base_val, working_val,
+		                            conflict_func, conflict_baton,
+		                            cancel_func, cancel_baton,
+			                    scratch_pool));
       if (got_conflict)
         {
           /* Describe the conflict, referring to base_val as well as
@@ -1481,6 +1509,7 @@
                          void *conflict_baton,
                          svn_cancel_func_t cancel_func,
                          void *cancel_baton,
+                         svn_boolean_t dry_run,
                          apr_pool_t *result_pool,
                          apr_pool_t *scratch_pool)
 {
@@ -1504,7 +1533,7 @@
                                                  new_val,
                                                  conflict_func, conflict_baton,
                                                  cancel_func, cancel_baton,
-                                                 result_pool, scratch_pool));
+						 dry_run, result_pool, scratch_pool));
     }
   else
     {
@@ -1520,7 +1549,7 @@
                                                new_val,
                                                conflict_func, conflict_baton,
                                                cancel_func, cancel_baton,
-                                               result_pool, scratch_pool));
+                                               dry_run, result_pool, scratch_pool));
     }
 
   return SVN_NO_ERROR;
@@ -1642,7 +1671,7 @@
                                       propname, base_val, to_val,
                                       conflict_func, conflict_baton,
                                       cancel_func, cancel_baton,
-                                      pool, iterpool));
+                                      dry_run, pool, iterpool));
 
       else if (! to_val) /* delete an existing property */
         SVN_ERR(apply_single_prop_delete(is_normal ? state : NULL, &conflict,
@@ -1653,7 +1682,7 @@
                                          propname, base_val, from_val,
                                          conflict_func, conflict_baton,
                                          cancel_func, cancel_baton,
-                                         pool, iterpool));
+                                         dry_run, pool, iterpool));
 
       else  /* changing an existing property */
         SVN_ERR(apply_single_prop_change(is_normal ? state : NULL, &conflict,
@@ -1664,7 +1693,7 @@
                                          propname, base_val, from_val, to_val,
                                          conflict_func, conflict_baton,
                                          cancel_func, cancel_baton,
-                                         pool, iterpool));
+                                         dry_run, pool, iterpool));
 
 
       /* merging logic complete, now we need to possibly log conflict

