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