subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From danie...@apache.org
Subject svn commit: r1170159 - /subversion/trunk/subversion/tests/cmdline/merge_tests.py
Date Tue, 13 Sep 2011 12:55:54 GMT
Author: danielsh
Date: Tue Sep 13 12:55:54 2011
New Revision: 1170159

URL: http://svn.apache.org/viewvc?rev=1170159&view=rev
Log:
* subversion/tests/cmdline/merge_tests.py
  (merge_dir_replace,
   merge_from_renamed_branch_fails_while_avoiding_repeat_merge,
   no_self_referential_or_nonexistent_inherited_mergeinfo):
     Add some issue numbers to the @Issue decorators.

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

Modified: subversion/trunk/subversion/tests/cmdline/merge_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/merge_tests.py?rev=1170159&r1=1170158&r2=1170159&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/merge_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/merge_tests.py Tue Sep 13 12:55:54 2011
@@ -2439,7 +2439,7 @@ def set_up_dir_replace(sbox):
 # A merge that replaces a directory
 # Tests for Issue #2144 and Issue #2607
 @SkipUnless(server_has_mergeinfo)
-@Issue(2144)
+@Issue(2144,2607)
 def merge_dir_replace(sbox):
   "merge a replacement of a directory"
 
@@ -9308,6 +9308,7 @@ def ignore_ancestry_and_mergeinfo(sbox):
 
 #----------------------------------------------------------------------
 @SkipUnless(server_has_mergeinfo)
+@Issue(3032)
 def merge_from_renamed_branch_fails_while_avoiding_repeat_merge(sbox):
   "merge from renamed branch"
   #Copy A/C to A/COPY_C results in r2.
@@ -16242,7 +16243,7 @@ def merge_with_os_deleted_subtrees(sbox)
 # Test for issue #3668 'inheritance can result in self-referential
 # mergeinfo' and issue #3669 'inheritance can result in mergeinfo
 # describing nonexistent sources'
-@Issue(3668)
+@Issue(3668,3669)
 def no_self_referential_or_nonexistent_inherited_mergeinfo(sbox):
   "don't inherit bogus mergeinfo"
 



Mime
View raw message