You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by rh...@apache.org on 2013/01/29 20:53:56 UTC
svn commit: r1440083 - in /subversion/trunk/subversion:
libsvn_client/merge.c tests/cmdline/merge_tests.py
Author: rhuijben
Date: Tue Jan 29 19:53:56 2013
New Revision: 1440083
URL: http://svn.apache.org/viewvc?rev=1440083&view=rev
Log:
Flip the switch to make the merge code resposible for the merge notifications.
* subversion/libsvn_client/merge.c
(HANDLE_NOTIFY_FROM_MERGE): Apply the switch, using this temporary macro.
* subversion/tests/cmdline/merge_tests.py
(single_file_replace_style_merge_capability): Expect single file merges now
to also report 'R'eplacements instead of 'D'elete+'A'dd.
Modified:
subversion/trunk/subversion/libsvn_client/merge.c
subversion/trunk/subversion/tests/cmdline/merge_tests.py
Modified: subversion/trunk/subversion/libsvn_client/merge.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/merge.c?rev=1440083&r1=1440082&r2=1440083&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/merge.c (original)
+++ subversion/trunk/subversion/libsvn_client/merge.c Tue Jan 29 19:53:56 2013
@@ -64,7 +64,7 @@
#include "svn_private_config.h"
-/* #define HANDLE_NOTIFY_FROM_MERGE */
+#define HANDLE_NOTIFY_FROM_MERGE
/*-----------------------------------------------------------------------*/
Modified: subversion/trunk/subversion/tests/cmdline/merge_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/merge_tests.py?rev=1440083&r1=1440082&r2=1440083&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/merge_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/merge_tests.py Tue Jan 29 19:53:56 2013
@@ -7023,8 +7023,7 @@ def single_file_replace_style_merge_capa
# Merge the file mu alone to rev1
svntest.actions.run_and_verify_svn(None,
expected_merge_output(None,
- ['D ' + mu_path + '\n',
- 'A ' + mu_path + '\n']),
+ ['R ' + mu_path + '\n']),
[],
'merge',
mu_path + '@2',