[infinispan-dev] CacheDelegate.lock() strangely differing between trunk and 4.2.x

[Manik Surtani]

On 16 Sep 2010, at 11:10, Galder Zamarreño wrote:

> 
> On Sep 15, 2010, at 8:31 PM, Sanne Grinovero wrote:
> 
>> 2010/9/15 Galder Zamarreño <galder at redhat.com>:
>>> Indeed, I've reopened https://jira.jboss.org/browse/ISPN-641 and https://jira.jboss.org/browse/ISPN-642 cos Sanne hasn't got around to putting this fixes in trunk yet and I don't want us end up missing them.
>> 
>> Sorry for that, I think I've misunderstood the directions given on the
>> mailing list regarding the 4.1 to 4.2 patches; In the 4.1.x era it was
>> clear to me that I needed to apply all patches of 4.1.x to trunk as
>> well, but thought I didn't need to do so for 4.2.
>> Galder, thanks for spotting that and warning me; I'm fixing it right now.
>> 
>> I'm still a bit confused about this practice, shouldn't we apply the
>> patches to a single branch and bring them to trunk using svn merge?
>> Just wondering.
> 
> We had the discussion before on the list, see http://lists.jboss.org/pipermail/infinispan-dev/2010-July/005768.html
> 
> We agreed on being easier to apply patches individually as you write them.

Yes, and what I do is I work off 4.2 and merge the commit to trunk (provided it is a 4.2 feature and not something for 5.0!)

E.g.,

4.2.x: commit (new revision is 1234)
trunk: svn merge 1233:1234 && commit

HTH
Manik

--
Manik Surtani
manik at jboss.org
Lead, Infinispan
Lead, JBoss Cache
http://www.infinispan.org
http://www.jbosscache.org