subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pbu...@apache.org
Subject svn commit: r1165713 - /subversion/trunk/subversion/tests/cmdline/resolve_tests.py
Date Tue, 06 Sep 2011 15:23:12 GMT
Author: pburba
Date: Tue Sep  6 15:23:11 2011
New Revision: 1165713

URL: http://svn.apache.org/viewvc?rev=1165713&view=rev
Log:
Tweak test for issue #3707 'property conflicts not handled correctly by svn
resolve' so it fails due to issue #3707.

* subversion/tests/cmdline/resolve_tests.py

  (prop_conflict_resolution): When this test was written a prop edit
   incoming on an identical local prop edit was a conflict.  That is no
   longer the case, so don't expect it.  This test *still* fails; this is
   simply a cleanup so it no longer fails for reasons unrelated to
   issue #3707.

Modified:
    subversion/trunk/subversion/tests/cmdline/resolve_tests.py

Modified: subversion/trunk/subversion/tests/cmdline/resolve_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/resolve_tests.py?rev=1165713&r1=1165712&r2=1165713&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/resolve_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/resolve_tests.py Tue Sep  6 15:23:11 2011
@@ -196,7 +196,7 @@ def prop_conflict_resolution(sbox):
     # Update, postponing all conflict resolution.
     svntest.actions.run_and_verify_svn(None, None, [], 'up',
                                        '--accept=postpone', wc_dir)
-    svntest.actions.run_and_verify_resolve([iota_path, mu_path, gamma_path], '-R',
+    svntest.actions.run_and_verify_resolve([iota_path, mu_path], '-R',
                                            '--accept', resolve_accept, wc_dir)
     svntest.actions.run_and_verify_svn(
       'svn revolve -R --accept=' + resolve_accept + ' of prop conflict '



Mime
View raw message