Re: [Framework-Team] how to resolve this merge conflict? (PLIP 9310)
Maybe shouldn't have done that. Eric Steele wrote: On Oct 12, 2009, at 7:01 PM, Kees Hink wrote: Merging the branch for PLIP 9310 into the 4.0 branch for CMFPlone, i ran into a conflict i wasn't able to resolve: http://pastie.org/652138 The bottom line is, 'svn resolve --accept working' doesn't resolve that last conflict. Does anyone know how to avoid this? esteele suggested merging changeset by changeset, that's a lot of changesets. (Though I guess i could try and go straight to the changeset which deletes the misbehaving file.) (I have subversion 1.6, I'll have a colleague with 1.5 have a go as well.) Kees I think http://dev.plone.org/plone/changeset/28275 where you merged in changes from 4.0 head is your problem. If you skip over this one, it should be a little more manageable. Eric ___ Framework-Team mailing list Framework-Team@lists.plone.org http://lists.plone.org/mailman/listinfo/framework-team
[PLIP-Advisories] Re: [Plone] #9309: Better search for East Asian (multi-byte) languages.
#9309: Better search for East Asian (multi-byte) languages. -+-- Reporter: terapyon |Owner: terapyon Type: PLIP | Status: assigned Priority: minor|Milestone: 4.0 Component: Unknown | Resolution: Keywords: search splitter CJK | -+-- Comment(by tyam): (In [30502]) Changed cfg since Zope code merged to 2.12. refs #9309 -- Ticket URL: http://dev.plone.org/plone/ticket/9309#comment:49 Plone http://plone.org Plone Content Management System ___ PLIP-Advisories mailing list plip-advisor...@lists.plone.org http://lists.plone.org/mailman/listinfo/plip-advisories
[PLIP-Advisories] Re: [Plone] #9310: User registration process more flexible
#9310: User registration process more flexible
-+--
Reporter: dokter |Owner: dokter
Type: PLIP | Status: assigned
Priority: minor|Milestone: 4.0
Component: Unknown | Resolution:
Keywords: |
-+--
Comment(by khink):
Changes have been merged into Plone 4.0 branch.
Details:
{{{
* Merge the used branches:
* merge https://svn.plone.org/svn/plone/Plone/branches/plip9310
-flexible-member-registration/
into https://svn.plone.org/svn/plone/Plone/branches/4.0/
(r30489)
A merge in two parts, [28069:28274] and [28275:30488], because
r28275 was a merge of
the current 4.0 branch unwise back into the plip-branch. (Unwise, in
retrospect.)
* merge
https://svn.plone.org/svn/plone/plone.app.users/branches/plip9310
-flexible-member-registration
into https://svn.plone.org/svn/plone/plone.app.users/trunk/
(r30468)
Also done:
* use z3c.autoinclude (r30493)
* modify rendering so it looks like other user/group configlets
(r30494)
* fix import of PloneMessageFactory (r30492)
* merge
https://svn.plone.org/svn/plone/plone.app.controlpanel/branches/plip9310
-flexible-member-registration
into https://svn.plone.org/svn/plone/plone.app.controlpanel/trunk/
(Merge not needed (trunk has 'utils' module), so not done.)
* merge
https://svn.plone.org/svn/plone/plone.app.form/branches/plip9310-flexible-
member-registration/
into https://svn.plone.org/svn/plone/plone.app.form/trunk/
(r30463)
(No real merge, just added 'metal:block define-
slot=authenticator' to pageform.pt.)
* Merge buildout:
* Added plone.app.users to sources.cfg (r30490)
* Added plone.app.users to Plone 4.0's egg dependencies (r30491)
* Made sure buildout uses trunk version of plone.app.form
* Checkout and run new version of buildout
* Delete PLIP9310-branches (r30503, r30504, r30505, r30506)
}}}
--
Ticket URL: http://dev.plone.org/plone/ticket/9310#comment:46
Plone http://plone.org
Plone Content Management System
___
PLIP-Advisories mailing list
plip-advisor...@lists.plone.org
http://lists.plone.org/mailman/listinfo/plip-advisories
[PLIP-Advisories] Re: [Plone] #7822: Make standard file content types use ZODB BLOB support
#7822: Make standard file content types use ZODB BLOB support +--- Reporter: limi|Owner: witsch Type: PLIP| Status: assigned Priority: major |Milestone: 4.0 Component: Infrastructure | Resolution: Keywords: focusarea | +--- Comment(by witsch): (In [30519]) aha, all new packages need to be added to `[test]` in order to make `$ bin/test ...` work (refs #7822, #9316) -- Ticket URL: http://dev.plone.org/plone/ticket/7822#comment:69 Plone http://plone.org Plone Content Management System ___ PLIP-Advisories mailing list plip-advisor...@lists.plone.org http://lists.plone.org/mailman/listinfo/plip-advisories
[PLIP-Advisories] Re: [Plone] #9310: User registration process more flexible
#9310: User registration process more flexible -+-- Reporter: dokter |Owner: dokter Type: PLIP | Status: closed Priority: minor|Milestone: 4.0 Component: Unknown | Resolution: fixed Keywords: | -+-- Changes (by esteele): * status: assigned = closed * resolution: = fixed -- Ticket URL: http://dev.plone.org/plone/ticket/9310#comment:47 Plone http://plone.org Plone Content Management System ___ PLIP-Advisories mailing list plip-advisor...@lists.plone.org http://lists.plone.org/mailman/listinfo/plip-advisories
[PLIP-Advisories] Re: [Plone] #8805: Do not ship with NuPlone anymore
#8805: Do not ship with NuPlone anymore ---+ Reporter: hannosch |Owner: esteele Type: PLIP | Status: assigned Priority: minor |Milestone: 4.0 Component: Templates/CSS | Resolution: Keywords: | ---+ Comment(by limi): Quoting Eric Steele: The one bit left is to make sure it works with 4.0. Since #9315 is done and merged, we're almost ready to close this one too — but it needs testing. -- Ticket URL: http://dev.plone.org/plone/ticket/8805#comment:23 Plone http://plone.org Plone Content Management System ___ PLIP-Advisories mailing list plip-advisor...@lists.plone.org http://lists.plone.org/mailman/listinfo/plip-advisories
[PLIP-Advisories] Re: [Plone] #8808: Require Python 2.5 or 2.6, Zope 2.12, and CMF 2.2 for Plone 4.0
#8808: Require Python 2.5 or 2.6, Zope 2.12, and CMF 2.2 for Plone 4.0 +--- Reporter: hannosch|Owner: davisagli Type: PLIP| Status: closed Priority: major |Milestone: 4.0 Component: Infrastructure | Resolution: fixed Keywords: | +--- Changes (by esteele): * status: assigned = closed * resolution: = fixed -- Ticket URL: http://dev.plone.org/plone/ticket/8808#comment:27 Plone http://plone.org Plone Content Management System ___ PLIP-Advisories mailing list plip-advisor...@lists.plone.org http://lists.plone.org/mailman/listinfo/plip-advisories
[PLIP-Advisories] Re: [Plone] #8802: Move our upgrade / migration infrastructure to GenericSetup
#8802: Move our upgrade / migration infrastructure to GenericSetup ---+ Reporter: hannosch |Owner: davisagli Type: PLIP | Status: closed Priority: minor |Milestone: 4.0 Component: Upgrade/Migration | Resolution: fixed Keywords: | ---+ Changes (by esteele): * status: assigned = closed * resolution: = fixed -- Ticket URL: http://dev.plone.org/plone/ticket/8802#comment:22 Plone http://plone.org Plone Content Management System ___ PLIP-Advisories mailing list plip-advisor...@lists.plone.org http://lists.plone.org/mailman/listinfo/plip-advisories
[PLIP-Advisories] Re: [Plone] #8801: Move action icon support into actions, deprecate CMFActionIcons
#8801: Move action icon support into actions, deprecate CMFActionIcons +--- Reporter: hannosch|Owner: davisagli Type: PLIP| Status: closed Priority: minor |Milestone: 4.0 Component: Infrastructure | Resolution: fixed Keywords: | +--- Changes (by esteele): * status: assigned = closed * resolution: = fixed -- Ticket URL: http://dev.plone.org/plone/ticket/8801#comment:25 Plone http://plone.org Plone Content Management System ___ PLIP-Advisories mailing list plip-advisor...@lists.plone.org http://lists.plone.org/mailman/listinfo/plip-advisories
[PLIP-Advisories] Re: [Plone] #9300: Well formed, valid XHTML
#9300: Well formed, valid XHTML --+- Reporter: benglynn |Owner: benglynn Type: PLIP | Status: assigned Priority: minor |Milestone: 4.0 Component: Unknown | Resolution: Keywords:| --+- Comment(by limi): Any updates on this? Was there ever a test suite set up to keep our XHTML from regressing? (Hanno said that there was work done on this during the Bristol sprint) -- Ticket URL: http://dev.plone.org/plone/ticket/9300#comment:19 Plone http://plone.org Plone Content Management System ___ PLIP-Advisories mailing list plip-advisor...@lists.plone.org http://lists.plone.org/mailman/listinfo/plip-advisories
[PLIP-Advisories] Re: [Plone] #9316: Unify folder implementations
#9316: Unify folder implementations +--- Reporter: smcmahon|Owner: witsch Type: PLIP| Status: closed Priority: n/a |Milestone: 4.0 Component: Infrastructure | Resolution: fixed Keywords: | +--- Changes (by witsch): * status: assigned = closed * resolution: = fixed Comment: the PLIP has been merged, and even though there are still [browser:buildouts/plone-coredev/branches/4.0/plips/plip9316-unified- folders@30539#l21 things left to wrap up polish] this ticket can be closed... -- Ticket URL: http://dev.plone.org/plone/ticket/9316#comment:45 Plone http://plone.org Plone Content Management System ___ PLIP-Advisories mailing list plip-advisor...@lists.plone.org http://lists.plone.org/mailman/listinfo/plip-advisories
[PLIP-Advisories] Re: [Plone] #9309: Better search for East Asian (multi-byte) languages.
#9309: Better search for East Asian (multi-byte) languages. -+-- Reporter: terapyon |Owner: terapyon Type: PLIP | Status: assigned Priority: minor|Milestone: 4.0 Component: Unknown | Resolution: Keywords: search splitter CJK | -+-- Comment(by esteele): (In [30540]) Use the Zope 2.12 branch. PLIP #9309 will need it. This auto- checkout can be removed once we have a 2.12.1 available. Refs #9309. -- Ticket URL: http://dev.plone.org/plone/ticket/9309#comment:51 Plone http://plone.org Plone Content Management System ___ PLIP-Advisories mailing list plip-advisor...@lists.plone.org http://lists.plone.org/mailman/listinfo/plip-advisories
[PLIP-Advisories] Re: [Plone] #7822: Make standard file content types use ZODB BLOB support
#7822: Make standard file content types use ZODB BLOB support +--- Reporter: limi|Owner: witsch Type: PLIP| Status: assigned Priority: major |Milestone: 4.0 Component: Infrastructure | Resolution: Keywords: focusarea | +--- Comment(by witsch): (In [30541]) merge [browser:Plone/branches/plip7822-blob-supp...@30540 branch for plip7822] into [browser:Plone/branches/4...@30540 4.0] (refs #7822) -- Ticket URL: http://dev.plone.org/plone/ticket/7822#comment:70 Plone http://plone.org Plone Content Management System ___ PLIP-Advisories mailing list plip-advisor...@lists.plone.org http://lists.plone.org/mailman/listinfo/plip-advisories
[PLIP-Advisories] Re: [Plone] #7822: Make standard file content types use ZODB BLOB support
#7822: Make standard file content types use ZODB BLOB support +--- Reporter: limi|Owner: witsch Type: PLIP| Status: assigned Priority: major |Milestone: 4.0 Component: Infrastructure | Resolution: Keywords: focusarea | +--- Comment(by witsch): (In [30544]) merge [browser:buildouts/plone- coredev/branches/4.0/plips/plip7822-blob-support@30543 buildout changes for plip7822] (refs #7822) -- Ticket URL: http://dev.plone.org/plone/ticket/7822#comment:71 Plone http://plone.org Plone Content Management System ___ PLIP-Advisories mailing list plip-advisor...@lists.plone.org http://lists.plone.org/mailman/listinfo/plip-advisories
[PLIP-Advisories] Re: [Plone] #7822: Make standard file content types use ZODB BLOB support
#7822: Make standard file content types use ZODB BLOB support +--- Reporter: limi|Owner: witsch Type: PLIP| Status: closed Priority: major |Milestone: 4.0 Component: Infrastructure | Resolution: fixed Keywords: focusarea | +--- Changes (by witsch): * status: assigned = closed * resolution: = fixed Comment: the PLIP has been merged, and even though there are still [browser:buildouts/plone-coredev/branches/4.0/plips/plip7822-blob- support@30545#l19 things left to wrap up polish] this ticket is done as far as the PLIP is concerned... -- Ticket URL: http://dev.plone.org/plone/ticket/7822#comment:73 Plone http://plone.org Plone Content Management System ___ PLIP-Advisories mailing list plip-advisor...@lists.plone.org http://lists.plone.org/mailman/listinfo/plip-advisories
[PLIP-Advisories] Re: [Plone] #8814: Replace SecureMailHost with a standard Zope mailhost
#8814: Replace SecureMailHost with a standard Zope mailhost +--- Reporter: hannosch|Owner: alecm Type: PLIP| Status: assigned Priority: n/a |Milestone: 4.0 Component: Infrastructure | Resolution: Keywords: | +--- Comment(by alecm): (In [30546]) Merge r28921:30021 from plip8814-mailhost branch (refs #8814) -- Ticket URL: http://dev.plone.org/plone/ticket/8814#comment:48 Plone http://plone.org Plone Content Management System ___ PLIP-Advisories mailing list plip-advisor...@lists.plone.org http://lists.plone.org/mailman/listinfo/plip-advisories
[PLIP-Advisories] Re: [Plone] #8814: Replace SecureMailHost with a standard Zope mailhost
#8814: Replace SecureMailHost with a standard Zope mailhost +--- Reporter: hannosch|Owner: alecm Type: PLIP| Status: assigned Priority: n/a |Milestone: 4.0 Component: Infrastructure | Resolution: Keywords: | +--- Comment(by alecm): Oops, that should have been r28712:28918 for plone.app.contentrules -- Ticket URL: http://dev.plone.org/plone/ticket/8814#comment:49 Plone http://plone.org Plone Content Management System ___ PLIP-Advisories mailing list plip-advisor...@lists.plone.org http://lists.plone.org/mailman/listinfo/plip-advisories
[PLIP-Advisories] Re: [Plone] #8814: Replace SecureMailHost with a standard Zope mailhost
#8814: Replace SecureMailHost with a standard Zope mailhost +--- Reporter: hannosch|Owner: alecm Type: PLIP| Status: assigned Priority: n/a |Milestone: 4.0 Component: Infrastructure | Resolution: Keywords: | +--- Comment(by alecm): (In [30547]) Merge r28921:30021 from plip8814-mailhost branch (refs #8814) -- Ticket URL: http://dev.plone.org/plone/ticket/8814#comment:50 Plone http://plone.org Plone Content Management System ___ PLIP-Advisories mailing list plip-advisor...@lists.plone.org http://lists.plone.org/mailman/listinfo/plip-advisories
[PLIP-Advisories] Re: [Plone] #8814: Replace SecureMailHost with a standard Zope mailhost
#8814: Replace SecureMailHost with a standard Zope mailhost +--- Reporter: hannosch|Owner: alecm Type: PLIP| Status: assigned Priority: n/a |Milestone: 4.0 Component: Infrastructure | Resolution: Keywords: | +--- Comment(by alecm): (In [30548]) Merged r28664:29350 from plip8814-mailhost branch (refs #8814) -- Ticket URL: http://dev.plone.org/plone/ticket/8814#comment:51 Plone http://plone.org Plone Content Management System ___ PLIP-Advisories mailing list plip-advisor...@lists.plone.org http://lists.plone.org/mailman/listinfo/plip-advisories
[PLIP-Advisories] Re: [Plone] #8814: Replace SecureMailHost with a standard Zope mailhost
#8814: Replace SecureMailHost with a standard Zope mailhost +--- Reporter: hannosch|Owner: alecm Type: PLIP| Status: assigned Priority: n/a |Milestone: 4.0 Component: Infrastructure | Resolution: Keywords: | +--- Comment(by alecm): This PLIP is now fully merged. -- Ticket URL: http://dev.plone.org/plone/ticket/8814#comment:52 Plone http://plone.org Plone Content Management System ___ PLIP-Advisories mailing list plip-advisor...@lists.plone.org http://lists.plone.org/mailman/listinfo/plip-advisories
[PLIP-Advisories] Re: [Plone] #7822: Make standard file content types use ZODB BLOB support
#7822: Make standard file content types use ZODB BLOB support +--- Reporter: limi|Owner: witsch Type: PLIP| Status: closed Priority: major |Milestone: 4.0 Component: Infrastructure | Resolution: fixed Keywords: focusarea | +--- Comment(by witsch): (In [30549]) triggered by the insight that the blob test setup doesn't work with plone 4.0 and zodb 3.9, because it is messing with things too much when zodb 3.9's `DemoStorage` actually already is a `BlobStorage` as well, i thought i should try if the `custom_zodb.py` is still needed at all... (refs #7822) -- Ticket URL: http://dev.plone.org/plone/ticket/7822#comment:74 Plone http://plone.org Plone Content Management System ___ PLIP-Advisories mailing list plip-advisor...@lists.plone.org http://lists.plone.org/mailman/listinfo/plip-advisories
[PLIP-Advisories] Re: [Plone] #8814: Replace SecureMailHost with a standard Zope mailhost
#8814: Replace SecureMailHost with a standard Zope mailhost +--- Reporter: hannosch|Owner: alecm Type: PLIP| Status: closed Priority: n/a |Milestone: 4.0 Component: Infrastructure | Resolution: fixed Keywords: | +--- Changes (by esteele): * status: assigned = closed * resolution: = fixed -- Ticket URL: http://dev.plone.org/plone/ticket/8814#comment:53 Plone http://plone.org Plone Content Management System ___ PLIP-Advisories mailing list plip-advisor...@lists.plone.org http://lists.plone.org/mailman/listinfo/plip-advisories
[PLIP-Advisories] Re: [Plone] #9186: Set Image IDs from Title field
#9186: Set Image IDs from Title field +--- Reporter: erikrose|Owner: erikrose Type: PLIP| Status: closed Priority: minor |Milestone: 4.0 Component: Archetypes | Resolution: fixed Keywords: | +--- Changes (by esteele): * status: reopened = closed * resolution: = fixed Comment: Merged in http://dev.plone.org/collective/changeset/99402 -- Ticket URL: http://dev.plone.org/plone/ticket/9186#comment:52 Plone http://plone.org Plone Content Management System ___ PLIP-Advisories mailing list plip-advisor...@lists.plone.org http://lists.plone.org/mailman/listinfo/plip-advisories
