[PythonCE] trunk merge?

[Joseph Armbruster]

Luke,

We could take it to that level if you want but I don't exactly see the need
for that level of complexity here.  As long as our commits are explicit
about which revision in svn.python.org we are merging from, that should be
enough.  I think the most important question is how you all wish to treat
2.4 / 2.5.  If they are strictly for maintenance (as svn.python.org) then
all we have to do is start out by placing them in their own branch and then
tag releases appropriately.  From 2.6 on out, we could develop in trunk and
branch when necessary.

Joseph Armbruster

On Tue, Mar 18, 2008 at 9:56 AM, Luke Dunstan <coder_infidel at hotmail.com>
wrote:

> --------------------------------------------------
> From: "Joseph Armbruster" <josepharmbruster at gmail.com>
> Sent: Tuesday, March 18, 2008 9:14 PM
> To: "Luke Dunstan" <coder_infidel at hotmail.com>; <pythonce at python.org>
> Subject: Re: [PythonCE] trunk merge?
>
> > Luke,
> >
> > Cool, I was able to see it this morning.  Quite empty indeed :-)  I can
> go
> > ahead and do the initial imports (if everyones ok with that).  However,
> > before I do so I would like to talk structure a bit.
> >
> > Currently, there are a few sources available from sf, 2.4/2.5 focused.
> > How do you / others feel about having a layout like this:
> >
> > /external
> >   .. third party libs go here ..
> > /pythonce
> >   /branches
> >     /release24-maint
> >     /release25-maint
> >   /tags
> >   /trunk  (2.6 merge will go here)
> >
> >
> > It parallels the python svn repository on purpose.
> >
> > Your thoughts?
> > Joseph Armbruster
>
> I have not had a lot of experience with Subversion yet, but I was reading
> the manual section on "vendor branches", and they suggest to have both the
> original source (e.g. Python trunk) and patched source (PythonCE trunk for
> 2.6) in the repository in separate directories. That way, to update our
> own
> source we first update our copy of the Python trunk source, and then use
> the
> Subversion merge command to automatically merge the changes into our
> branch.
> For example:
>
> /python
>  /trunk <- (1) update to latest Python source
> /pythonce
>  /trunk <- (2) merge /python/trunk into here
>
> If there are other source control tools that make it easier though, then
> go
> for it.
>
> Luke
>
> >
> >
> > Luke Dunstan wrote:
> >>
> >> --------------------------------------------------
> >> From: "Joseph Armbruster" <josepharmbruster at gmail.com>
> >> Sent: Tuesday, March 18, 2008 7:57 AM
> >> To: "Luke Dunstan" <coder_infidel at hotmail.com>
> >> Subject: Re: [PythonCE] trunk merge?
> >>
> >>> Luke,
> >>>
> >>> I'm having a hard time finding the Sourceforge Subversion Repository.
> >>> The only thing I can seem to find is a cvs repo linked from the
> project.
> >>> Am I missing something?
> >>>
> >>> Thank You,
> >>> Joseph Armbruster
> >>
> >> No, there is no source in Subversion yet. I have now enabled it. Let me
> >> know if any other settings need to be changed.
> >>
> >> Luke
> >>
> >>
> >>
> >
> >
> _______________________________________________
> PythonCE mailing list
> PythonCE at python.org
> http://mail.python.org/mailman/listinfo/pythonce
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://mail.python.org/pipermail/pythonce/attachments/20080318/244c0211/attachment.htm