Thanks Senthil,
+1 to commit with a change to the log message stating the real
purpose(Only non-reflective prop changes should get merged) of this change.
With regards
Kamesh Jayachandran
Senthil Kumaran S wrote:
> Hi Kamesh,
>
> Kamesh Jayachandran wrote:
>> I would suggest changing this testcase to retain first prop changes
>> in alpha(r2 change) and drop the adhoc change.
>
> As per your comments, I ve modified the patch (attached).
>
> [[[
> On the issue-2897 branch:
>
> Set property on alpha and beta files.
>
> * subversion/tests/cmdline/merge_tests.py
> (merge_non_reflective_text_and_prop_change): Set property on both alpha
> and beta files.
>
> Patch by: stylesen
> Suggested by: kameshj
> ]]]
>
> Thank You.
>
> --
> Senthil Kumaran S
> http://www.stylesen.org/
> ------------------------------------------------------------------------
>
> ---------------------------------------------------------------------
> 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 Tue Dec 18 11:18:07 2007