Re: svn commit: r21781 - in branches/1.4.x-issue-2618: . subversion/libsvn_wc subversion/tests/cmdline

On 10/5/06, lgo@tigris.org <lgo@tigris.org> wrote:
> Author: lgo
> Date: Thu Oct 5 11:44:20 2006
> New Revision: 21781
>
> Log:
> On the 1.4.x-issue-2618 branch: Backport the fixes and regression
> tests for issue #2618 from trunk (r21720, r21724, r21726).
>
> * subversion/tests/cmdline/update_tests.py:
> (update_wc_with_replaced_file): add the detect_conflict_files
> function to fix the test on the 1.4.x branch.
Hmm, it seems you actually didn't add function detect_conflict_files
in this commit. It was added some time ago, but you should reference
to it directly instead of "svntest.tree.detect_conflict_files". Could
you fix it and the log message?

>
> Modified:
> branches/1.4.x-issue-2618/ (props changed)
> branches/1.4.x-issue-2618/subversion/libsvn_wc/adm_files.c
> branches/1.4.x-issue-2618/subversion/libsvn_wc/adm_files.h
> branches/1.4.x-issue-2618/subversion/libsvn_wc/update_editor.c
> branches/1.4.x-issue-2618/subversion/tests/cmdline/update_tests.py
>

-- 
Ivan Zhakov
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org