<br><br><div class="gmail_quote">On Mon, Aug 3, 2009 at 23:06, "Martin v. Löwis" <span dir="ltr"><<a href="mailto:martin@v.loewis.de">martin@v.loewis.de</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex;">
> empty: keep-clone?<br>
<br>
I use that as a branch to tell build slaves to clean out their<br>
current checkouts. So keep-clone sounds right, assuming it is possible<br>
to target buildslaves at either clones or branches (which, IIUC, would<br>
be necessary anyway, since we are using a mix of branches and clones).<br>
<div class="im"><br>
> amk-mailbox: keep-clone?<br>
> twouters-dictviews-backport: keep-clone?<br>
> bcannon-sandboxing: keep-clone?<br>
</div>> bippolito-newstruct: merges?<br>
</blockquote><div><br></div><div><br></div><div>keep-clone bcannon-objcap, strip bcannon-sandboxing.</div><div><br></div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex;">
<br>
You'll probably need to explicitly ping the specific owners<br>
(Andrew Kuchling, Thomas Wouters, Brett Cannon, Bob Ippolito)<br>
to understand the fate of these branches.<br>
<br>
This also raises the question how developers should publish their<br>
"own" branches. For the bzr setup, there was apparently a proposal<br>
to use directories for that, i.e. giving each developer a directory<br>
on <a href="http://code.python.org" target="_blank">code.python.org</a> to publish branches.<br>
</blockquote><div><br></div><div>Yeah, I thought I brought this up and people liked the idea of keeping some user directory on <a href="http://hg.python.org">hg.python.org</a>. I am fine with <a href="http://code.python.org">code.python.org</a> as well. But having some place would be really handy (although having bitbucket and Google Code makes this not quite as important).</div>
<div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex;"><br>
Not doing that, but keeping owner information encoded in the clone<br>
name, would be fine as well.<br>
<br>
> release23-branch: merges?<br>
> r23b2-branch: merges?<br>
> r22rc1-branch: strip<br>
<div class="im">> r22b1-branch: merges?<br>
> r22a4-branch: merges?<br>
> r22a3-branch: merges?<br>
</div>> r161-branch: merges?<br>
<br>
It seems we had been creating CVS branches for every release around<br>
that time; I don't remember the details. Each such branch should end<br>
up in a tag. For example, release23-branch should (and does) ultimately<br>
lead to tags/r23. cvs2svn wasn't able to recognize this correctly (as<br>
CVS branches apply to each file individually), so it created the r23<br>
tag out of various copies that were current when the tag was made.<br>
<br>
I don't know what your plan is wrt. release tags, i.e. whether you<br>
want to keep them all. If you are stripping out some of the branches,<br>
but plan to keep the release tags, I wonder what the tags look like.<br>
<br>
> release22-branch: merged-r24921<br>
<br>
Not really. Jack Jansen merged some changes that got first applied<br>
to the 2.2<br>
<div class="im"><br>
> r22b2-branch: merges? merged-r24426<br>
> r22b2-branch: merges? merged-r24426<br>
<br>
</div>> release20-maint: keep-named<br>
<br>
See above. So you do plan to keep all past releases?<br>
<br>
> release152p1-patches: merges?<br>
<br>
Probably merged. I don't recall whether 1.5.2p1 really happened;<br>
in r14966, Fred claims that he merged all changes from 1.5.2p2 (!).<br>
<br>
"Hopefully I got all this right!"<br>
<br>
I surely hope the same - I doubt anybody would go back and check<br>
whether anything is missing.<br>
<br>
Regards,<br>
<font color="#888888">Martin<br>
</font><div><div></div><div class="h5">_______________________________________________<br>
Python-Dev mailing list<br>
<a href="mailto:Python-Dev@python.org">Python-Dev@python.org</a><br>
<a href="http://mail.python.org/mailman/listinfo/python-dev" target="_blank">http://mail.python.org/mailman/listinfo/python-dev</a><br>
Unsubscribe: <a href="http://mail.python.org/mailman/options/python-dev/brett%40python.org" target="_blank">http://mail.python.org/mailman/options/python-dev/brett%40python.org</a><br>
</div></div></blockquote></div><br>