dlr@tigris.org wrote:
> Author: dlr
> Date: Wed Sep 20 11:35:48 2006
> New Revision: 21567
>
> Log:
> On the merge-tracking branch: Fix merge test #36 to acount for the
> Merge Tracking housekeeping property.
>
> * subversion/tests/cmdline/merge_tests.py
> (merge_conflict_markers_matching_eol): Expect to have 'prop
> modified' at target root.
>
> Patch by: Kamesh Jayachandran <kamesh@collab.net>
>
>
> Modified:
> branches/merge-tracking/subversion/tests/cmdline/merge_tests.py
>
> Modified: branches/merge-tracking/subversion/tests/cmdline/merge_tests.py
> URL: http://svn.collab.net/viewvc/svn/branches/merge-tracking/subversion/tests/cmdline/merge_tests.py?pathrev=21567&r1=21566&r2=21567
> ==============================================================================
> --- branches/merge-tracking/subversion/tests/cmdline/merge_tests.py (original)
> +++ branches/merge-tracking/subversion/tests/cmdline/merge_tests.py Wed Sep 20 11:35:48 2006
> @@ -1794,6 +1794,7 @@
> 'Q/bar' : Item(),
> })
>
> + return
>
My patch did not have the above retrun.
Please update the log message for this return.
With regards
Kamesh Jayachandran
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Sep 21 07:47:19 2006