You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Kamesh Jayachandran <ka...@collab.net> on 2007/12/18 09:37:38 UTC
Re: [PATCH] Changes to merge test 78
Thanks Senthil.
Senthil Kumaran S wrote:
> Hi,
>
> I am attaching a patch along with this email in order to set property
> on beta file instead of alpha to merge test 78 (in issue 2897 branch).[[[
> On the issue-2897 branch:
>
> Set property on beta instead of alpha.
The idea behind this change is not just changing the target where we set
the property to. We do this to ensure 'alpha' does not get any
'reflective prop changes'.
I would suggest changing this testcase to retain first prop changes in
alpha(r2 change) and drop the adhoc change.
The final merge expected_output should be changed to include
'beta' : Item(status=' U'),
With regards
Kamesh Jayachandran
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: [PATCH] Changes to merge test 78
Posted by Senthil Kumaran S <se...@collab.net>.
Kamesh Jayachandran wrote:
> +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.
Thanks for your review Kamesh. Committed in r28523.
--
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
Re: [PATCH] Changes to merge test 78
Posted by Kamesh Jayachandran <ka...@collab.net>.
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
Re: [PATCH] Changes to merge test 78
Posted by Senthil Kumaran S <se...@collab.net>.
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/