[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

RE: svn commit: r1170159 - /subversion/trunk/subversion/tests/cmdline/merge_tests.py

From: Bert Huijben <bert_at_qqmail.nl>
Date: Tue, 13 Sep 2011 14:58:37 +0200

> -----Original Message-----
> From: danielsh_at_apache.org [mailto:danielsh_at_apache.org]
> Sent: dinsdag 13 september 2011 14:56
> To: commits_at_subversion.apache.org
> Subject: svn commit: r1170159 -
> /subversion/trunk/subversion/tests/cmdline/merge_tests.py
>
> 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

After this change ^^^ is no longer necessary.
(Doesn't apply to the next hunk as it contains more information there)

        Bert
Received on 2011-09-13 14:59:00 CEST

This is an archived mail posted to the Subversion Dev mailing list.