You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Senthil Kumaran S <se...@collab.net> on 2007/12/04 12:08:08 UTC
[PATCH] Additional testcase for issue #2897
Hi,
I am attaching a patch along with this email which is a python test case for
testing "Merge on non-reflective text change", which is an additional test case
to prove issue #2897.
[[[
Additional testcase for issue #2897.
Merge non-reflective text change
* subversion/tests/cmdline/merge_tests.py
(merge_non_reflective_text_change): New function.
(test_list): Add 'merge_non_reflective_text_change' as XFail test
Patch by: stylesen
Suggested by: kameshj
]]]
PS: This patch is based on issue-2897 branch, and not on trunk.
Thank You.
--
Senthil Kumaran S
http://www.stylesen.org/
Re: [PATCH] Additional testcase for issue #2897
Posted by Senthil Kumaran S <se...@collab.net>.
Hi Kamesh,
Kamesh Jayachandran wrote:
> 1. When you do a change in /A/B/E/alpha at r5(a.k.a /trunk), instead of
> 'line3->fbline3' make it as 'line3->tline3', just to identify it as the
> trunk change.
> 2. When you modify the adhoc change along with merge change i.e
> 'line5->fbline5' make it as 'line5->adhoc fbline5', just to identify it
> as the adhoc change.
>
> +1 to commit with the above changes.
I ve did the above changes and committed the patch in r28233.
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
Re: [PATCH] Additional testcase for issue #2897
Posted by Kamesh Jayachandran <ka...@collab.net>.
Senthil,
Thanks for the patch.
Patch looks good, two small suggestions though.
1. When you do a change in /A/B/E/alpha at r5(a.k.a /trunk), instead of
'line3->fbline3' make it as 'line3->tline3', just to identify it as the
trunk change.
2. When you modify the adhoc change along with merge change i.e
'line5->fbline5' make it as 'line5->adhoc fbline5', just to identify it
as the adhoc change.
+1 to commit with the above changes.
With regards
Kamesh Jayachandran
Senthil Kumaran S wrote:
> Hi,
>
> I am attaching a patch along with this email which is a python test
> case for testing "Merge on non-reflective text change", which is an
> additional test case to prove issue #2897.
>
> [[[
> Additional testcase for issue #2897.
>
> Merge non-reflective text change
>
> * subversion/tests/cmdline/merge_tests.py
> (merge_non_reflective_text_change): New function.
> (test_list): Add 'merge_non_reflective_text_change' as XFail test
>
> Patch by: stylesen
> Suggested by: kameshj
> ]]]
>
> PS: This patch is based on issue-2897 branch, and not on trunk.
>
> 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