On Oct 10, 2009, at 11:02 AM, Hanno Schlichting wrote:
The easiest thing to do right now is to do as Maurits advices and
don't rely on Subversion to tell you what needs to be merged.
btw, i think you're only gonna need that the first time around, i.e.
when subversion hasn't set up the accordi
Hi.
On Sat, Oct 10, 2009 at 2:24 AM, Maurits van Rees wrote:
> While merging branches for plip 9214 I ran into a couple of problems,
> which some of you may run into as well, so here are my notes. When
> doing a simple "svn merge
> http://.../Plone/branches/plip9214-emaillogins"; into the Plone
Hi,
While merging branches for plip 9214 I ran into a couple of problems,
which some of you may run into as well, so here are my notes. When
doing a simple "svn merge
http://.../Plone/branches/plip9214-emaillogins"; into the Plone 4.0
branch, several changes were pulled in that definitely were no
