On Thu, 2008-08-28 at 08:02 +0300, Daniel Shahaf wrote:
> For the archives: This patch was committed in r32605.
Neels,
I committed the patch to the tree-conflicts branch in r32605.
I noticed today that it causes a few more tests are failing because they
are still trying to use "set_up_tree_conflicts()", which does not exist
any more.
Could you investigate, please?
> $ grep set_up_tree_conflicts subversion/tests/cmdline/*.py
> subversion/tests/cmdline/commit_tests.py: wc_dir_2 = svntest.actions.set_up_tree_conflicts(sbox)
> subversion/tests/cmdline/commit_tests.py: wc_dir_2 = svntest.actions.set_up_tree_conflicts(sbox)
> subversion/tests/cmdline/info_tests.py: wc_dir_2 = svntest.actions.set_up_tree_conflicts(sbox)
> subversion/tests/cmdline/revert_tests.py: wc_dir_2 = svntest.actions.set_up_tree_conflicts(sbox)
> subversion/tests/cmdline/stat_tests.py: wc_dir_2 = svntest.actions.set_up_tree_conflicts(sbox)
> subversion/tests/cmdline/tree_conflict_tests.py:# (See also the somewhat related svntest.actions.set_up_tree_conflicts().)
Thanks,
- Julian
> Neels Janosch Hofmeyr wrote on Tue, 19 Aug 2008 at 01:34 +0200:
> > [[[
> > Replacing file-based tree-conflicts cmdline tests. The new tests are
> > concerned with directory *and* file victims, in different tree depths.
> > Contains new tests for update, switch and merge operations.
> >
> > * subversion/tests/cmdline/svntest/actions.py
> > (set_up_tree_conflicts): Remove old helper for update, switch.
> > (set_up_tree_conflicts_for_merge): Remove old helper for merge.
[..]
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-08-28 15:52:11 CEST