Re: [PATCH] Fix issue #2829

Hi Kamesh,

Kamesh Jayachandran wrote:
> My review comments are as follows,

Thank you for your comments. I am attaching an improved patch along with
this mail. Please review this patch and let me know your comments. Some
of the things which you have mentioned in your previous comments are not
corrected in this patch which are as follows:

>> @@ -1005,13 +1005,14 @@
>
>> })
>
>> expected_disk = wc.State('', {
>
>> '' : Item(props={SVN_PROP_MERGE_INFO : '/A/B:1,3'}),
>
>> - 'F' : Item(),
>
>> - 'lambda' : Item("This is the file 'lambda'.\nchange lambda.\n"),
>
>> + 'F' : Item(props={SVN_PROP_MERGE_INFO : '/A/B/F:3'}),
>
>> + 'lambda' : Item(contents="This is the file 'lambda'.\nchange
>> lambda.\n",
>
>> + props={SVN_PROP_MERGE_INFO : '/A/B/lambda:3'}),
>
>> })
>
>
> Here '' should have a mergeinfo of '/A/B:1'
> 'F' and 'lambda' should have a mergeinfo of '/A/B:1,3'

Here '' still has mergeinfo '/A/B:1,3'

>> expected_status = wc.State(I_path, {
>
>> '' : Item(status=' M'),
>
>
> As per above point here '' should not have prop modified.

Not corrected yet.

>> @@ -1834,7 +1835,7 @@
>
>> })
>
>> expected_disk = wc.State('', {
>
>> '' : Item(props={SVN_PROP_MERGE_INFO : '/A/B/F:2'}),
>
>
> Here '' should have no merge info as some of its child got skipped of
> merge.
>
>> @@ -1881,7 +1882,8 @@
>
>> expected_disk = wc.State('', {
>
>> '' : Item(props={SVN_PROP_MERGE_INFO : '/A/B/F:2'}),
>
>
> Here '' should have no merge info as some of its child got skipped of
> merge.

Still this exists.

But with this patch all the test cases pass in all the 3 layers.

-- 
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