+1 Vincent Massol a écrit :

Hi,

We've just committed the patch for XWIKI-1459 yesterday. However we may need to rollback it.

Let me explain the situation:

1) It's a big and dangerous patch 2) The Curriki project is currently building on top of XWiki trunk and they're doing some important release soon. 3) They understand that using XWiki trunk is risky and they're going to branch off xwiki trunk real soon (I heard it's planned for next week) 4) They have some test server and it seems the recent commit broke a few things. No investigations done yet.

As a consequence, they're asking us if we could rollback that patch and release 1.1M4 without it so that they can branch at 1.1M4. We can then apply the patch after.

The problem is that 1.1M4 was supposed to be our last release with new features and 1.1M5/M6 were supposed to be 1.1RC1/RC2 till the final release planned for the 3rd of September.

I don't think we'll be able to release a good 1.1 version if we only have one release for hunting down bug fixes. I also think Curriki is right in that committing such a big change one or 2 days before a release is asking for trouble...

Thus I'd like to propose the following:

A) We rollback the patch and release 1.1M4 without it B) We shift the final 1.1 release by 15 days - New date: 17th of September. We add one release: 1.1M5 and then 1.1RC1 and 1.1RC2 C) We add this patch in 1.1M5. However we don't generally allow any other important change unless there's a good reason. I.e. we consider 1.1M5 almost like a RC except for this patch

WDYT?

Thanks -Vincent

-- Ludovic Dubost Blog: http://www.ludovic.org/blog/ XWiki: http://www.xwiki.com Skype: ldubost GTalk: ldubost AIM: nvludo Yahoo: ludovic

+2 Sergiu&Marta Vincent Massol wrote:

Thus I'd like to propose the following:

A) We rollback the patch and release 1.1M4 without it B) We shift the final 1.1 release by 15 days - New date: 17th of September. We add one release: 1.1M5 and then 1.1RC1 and 1.1RC2 C) We add this patch in 1.1M5. However we don't generally allow any other important change unless there's a good reason. I.e. we consider 1.1M5 almost like a RC except for this patch

After more thinking and talking to Ludovic here's another proposal which I think is even better: * We rollback the patch * We don't have a new iteration for 1.1, i.e. we still deliver it on time for the 3rd of September * Instead just after 1.1M4 is released we create a branch called XWIKI_1_1 and we work on the 1.1RC1 and 1.1RC2 on that branch * Whenever we fix stuff on that branch we also backport them on trunk * The trunk becomes 1.2-SNAPSHOT * Artem commits his stuff on the trunk This is much better because: 1) It allows us to keep our schedule 2) We are not blocked and we can start working on 1.2 immediatly and do all sort of dangerous things there (within reasons of course and still with much testing!!) 3) Actually even if we introduce Artem's patch on 1.1M5 it would still have been dangerous for the whole 1.1 version The only downside (which is minor IMO compared to the advantages) is that we have to backport RC1 and RC2 changes to the trunk. But that's only for less than a month. WDYT? Thanks -Vincent On Aug 8, 2007, at 9:32 PM, Vincent Massol wrote:

Hi,

We've just committed the patch for XWIKI-1459 yesterday. However we may need to rollback it.

Let me explain the situation:

1) It's a big and dangerous patch 2) The Curriki project is currently building on top of XWiki trunk and they're doing some important release soon. 3) They understand that using XWiki trunk is risky and they're going to branch off xwiki trunk real soon (I heard it's planned for next week) 4) They have some test server and it seems the recent commit broke a few things. No investigations done yet.

As a consequence, they're asking us if we could rollback that patch and release 1.1M4 without it so that they can branch at 1.1M4. We can then apply the patch after.

The problem is that 1.1M4 was supposed to be our last release with new features and 1.1M5/M6 were supposed to be 1.1RC1/RC2 till the final release planned for the 3rd of September.

I don't think we'll be able to release a good 1.1 version if we only have one release for hunting down bug fixes. I also think Curriki is right in that committing such a big change one or 2 days before a release is asking for trouble...

Thus I'd like to propose the following:

A) We rollback the patch and release 1.1M4 without it B) We shift the final 1.1 release by 15 days - New date: 17th of September. We add one release: 1.1M5 and then 1.1RC1 and 1.1RC2 C) We add this patch in 1.1M5. However we don't generally allow any other important change unless there's a good reason. I.e. we consider 1.1M5 almost like a RC except for this patch

WDYT?

Thanks -Vincent

-- You receive this message as a subscriber of the xwiki- [email protected] mailing list. To unsubscribe: mailto:[email protected] For general help: mailto:[email protected]?subject=help ObjectWeb mailing lists service home page: http://www.objectweb.org/ wws