Can someone look into this?
With regards
Kamesh Jayachandran
Kamesh Jayachandran wrote:
> Hi All,
> Find the attached patch and log to make 35th tests on merge-tests.py
> tests to pass on merge-tracking branch.
>
> Not sure whether it is the right approach for the following 2 reasons,
> 1. Should we record the mergeinfo in case of conflicting merges?
> 2. Should'nt we check for historical relation ships between source and
> destination before recording mergeinfos?
>
> With regards
> Kamesh Jayachandran
>
> ------------------------------------------------------------------------
>
> [[[
> Patch by: Kamesh Jayachandran <kamesh@collab.net>
>
> Fix 'merge_add_over_versioned_file_conflicts' testcase taking care of
> 'merge-tracking' implementation.
>
> * subversion/tests/cmdline/merge_tests.py
> (merge_add_over_versioned_file_conflicts):
> Expect to have 'prop modified'
> ]]]
>
> ------------------------------------------------------------------------
>
> Index: subversion/tests/cmdline/merge_tests.py
> ===================================================================
> --- subversion/tests/cmdline/merge_tests.py (revision 21450)
> +++ subversion/tests/cmdline/merge_tests.py (working copy)
> @@ -3637,7 +3637,7 @@
> 'beta' : Item("This is the file 'beta'.\n"),
> })
> expected_status = wc.State(short_E_path, {
> - '' : Item(status=' ', wc_rev=1),
> + '' : Item(status=' M', wc_rev=1),
> 'alpha' : Item(status='C ', wc_rev=1),
> 'beta' : Item(status=' ', wc_rev=1),
> })
>
>
> ------------------------------------------------------------------------
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: dev-help@subversion.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Sep 15 14:41:09 2006