Re: [Python-Dev] Please sync your feature branches

2011-03-06 Thread Dj Gilcrease
On Sun, Mar 6, 2011 at 7:52 AM, Stefan Krah wrote: > It does here after a fresh clone: Thats because it never got the revision that closed that branch, just merge http://hg.python.org/cpython/rev/b77918288f7d to http://hg.python.org/features/py3k-cdecimal/

Re: [Python-Dev] Please sync your feature branches

2011-03-06 Thread Antoine Pitrou
Hi, > I assume Stefan was referring to the features/py3k-cdecimal clone > rather than the cpython one. This is going to happen with all the > server-side clones - we really only want "default" in the clone, but > the maintenance branches will come along for the ride. There are > actually a few t

Re: [Python-Dev] Please sync your feature branches

2011-03-06 Thread Stefan Krah
Georg Brandl wrote: > > 2) 3.2, 3.1 and legacy-trunk show up as 'inactive' on the command line, but > > not in the web interface. Should these be closed to avoid confusion? > > Hmm, and legacy-trunk should already be closed actually. It does not show > up in "hg branches" for me. It does here a

Re: [Python-Dev] Please sync your feature branches

2011-03-06 Thread Nick Coghlan
On Sun, Mar 6, 2011 at 10:17 PM, Georg Brandl wrote: >> 2) 3.2, 3.1 and legacy-trunk show up as 'inactive' on the command line, but >> not in the web interface. Should these be closed to avoid confusion? > > Hmm, and legacy-trunk should already be closed actually.  It does not show > up in "hg bra

Re: [Python-Dev] Please sync your feature branches

2011-03-06 Thread Georg Brandl
On 06.03.2011 12:56, Stefan Krah wrote: > Antoine Pitrou wrote: >> > Is that really going to work? I.e. will Mercurial be able to merge from >> > default to one of the feature branches? If so, what will be the >> > procedure? What would be the exact steps to try this out on the PEP 382 >> > branch

Re: [Python-Dev] Please sync your feature branches

2011-03-06 Thread Georg Brandl
On 06.03.2011 12:56, Stefan Krah wrote: > Antoine Pitrou wrote: >> > Is that really going to work? I.e. will Mercurial be able to merge from >> > default to one of the feature branches? If so, what will be the >> > procedure? What would be the exact steps to try this out on the PEP 382 >> > branch

Re: [Python-Dev] Please sync your feature branches

2011-03-06 Thread Stefan Krah
Antoine Pitrou wrote: > > Is that really going to work? I.e. will Mercurial be able to merge from > > default to one of the feature branches? If so, what will be the > > procedure? What would be the exact steps to try this out on the PEP 382 > > branch (say)? > > I've sketched out the steps in >

Re: [Python-Dev] Please sync your feature branches

2011-02-28 Thread Antoine Pitrou
On Mon, 28 Feb 2011 23:54:46 +0100 "Martin v. Löwis" wrote: > Am 28.02.2011 23:45, schrieb Antoine Pitrou: > > Le lundi 28 février 2011 à 23:26 +0100, "Martin v. Löwis" a écrit : > >>> In preparation for the hg switch, I would recommend that, if you have > >>> any feature branches managed with svn

Re: [Python-Dev] Please sync your feature branches

2011-02-28 Thread Martin v. Löwis
Am 28.02.2011 23:45, schrieb Antoine Pitrou: > Le lundi 28 février 2011 à 23:26 +0100, "Martin v. Löwis" a écrit : >>> In preparation for the hg switch, I would recommend that, if you have >>> any feature branches managed with svnmerge, you sync them with the py3k >>> branch before we switch. That

Re: [Python-Dev] Please sync your feature branches

2011-02-28 Thread Antoine Pitrou
Le lundi 28 février 2011 à 23:26 +0100, "Martin v. Löwis" a écrit : > > In preparation for the hg switch, I would recommend that, if you have > > any feature branches managed with svnmerge, you sync them with the py3k > > branch before we switch. That way, it will make it easier to "bridge > > the

Re: [Python-Dev] Please sync your feature branches

2011-02-28 Thread Martin v. Löwis
> In preparation for the hg switch, I would recommend that, if you have > any feature branches managed with svnmerge, you sync them with the py3k > branch before we switch. That way, it will make it easier to "bridge > the gap" when you create a new repository for your work after the > switch (the

Re: [Python-Dev] Please sync your feature branches

2011-02-28 Thread Georg Brandl
On 28.02.2011 19:15, Antoine Pitrou wrote: > > Hello, > > In preparation for the hg switch, I would recommend that, if you have > any feature branches managed with svnmerge, you sync them with the py3k > branch before we switch. That way, it will make it easier to "bridge > the gap" when you crea

[Python-Dev] Please sync your feature branches

2011-02-28 Thread Antoine Pitrou
Hello, In preparation for the hg switch, I would recommend that, if you have any feature branches managed with svnmerge, you sync them with the py3k branch before we switch. That way, it will make it easier to "bridge the gap" when you create a new repository for your work after the switch (the s