[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: [PATCH] Changes to merge test 78

From: Kamesh Jayachandran <kamesh_at_collab.net>
Date: 2007-12-18 10:37:38 CET

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
Received on Tue Dec 18 10:37:10 2007

This is an archived mail posted to the Subversion Dev mailing list.