Re: [Python-Dev] hg pull failed

2011-03-07 Thread Terry Reedy
On 3/7/2011 2:16 AM, Georg Brandl wrote: On 07.03.2011 00:16, Terry Reedy wrote: But would it work ?? to just pull once into default from the central repository (slow) and then pull from there (fast) into maintenance clones? I expect to nearly always be only working on issues that affect

Re: [Python-Dev] hg pull failed

2011-03-06 Thread Georg Brandl
On 07.03.2011 00:16, Terry Reedy wrote: > On 3/6/2011 11:07 AM, Georg Brandl wrote: >> On 06.03.2011 16:44, s...@pobox.com wrote: >>> >>> Georg> Yesterday's repository was still the test repository, now it's >>> Georg> the real one. You'll need to clone again. >>> >>> Thanks. >>> >>> I

Re: [Python-Dev] hg pull failed

2011-03-06 Thread Nick Coghlan
On Mon, Mar 7, 2011 at 5:36 AM, Adrian Buehlmann wrote: > Not sure if it fits in your specific case you mention here, but > Mercurial has a reserved path alias name "default-push" with special > meaning: > > 'hg push' pushes to > > (1) the path defined as default-push under [paths] in .hg/hgrc > (

Re: [Python-Dev] hg pull failed

2011-03-06 Thread Terry Reedy
On 3/6/2011 11:07 AM, Georg Brandl wrote: On 06.03.2011 16:44, s...@pobox.com wrote: Georg> Yesterday's repository was still the test repository, now it's Georg> the real one. You'll need to clone again. Thanks. I have a question about updates from cloned clones. Suppose I clone

Re: [Python-Dev] hg pull failed

2011-03-06 Thread Martin v. Löwis
Not sure if it fits in your specific case you mention here, but Mercurial has a reserved path alias name "default-push" with special meaning: Ah. I didn't know that, thanks. Martin ___ Python-Dev mailing list Python-Dev@python.org http://mail.python.o

Re: [Python-Dev] hg pull failed

2011-03-06 Thread Adrian Buehlmann
On 2011-03-06 20:09, "Martin v. Löwis" wrote: >>> So, when I cloned, I should have done something like this: >>> >>> hg clone http://hg.python.org/cpython >>> hg clone cpython 3.2 >>> hg clone 3.2 3.1 >>> hg clone cpython 2.7 >>> hg clone 2.7 2.6 >>> hg clone 2.6 2.5 >

Re: [Python-Dev] hg pull failed

2011-03-06 Thread Martin v. Löwis
So, when I cloned, I should have done something like this: hg clone http://hg.python.org/cpython hg clone cpython 3.2 hg clone 3.2 3.1 hg clone cpython 2.7 hg clone 2.7 2.6 hg clone 2.6 2.5 hg clone 2.5 2.4 instead of cloning everything from cpython, right? Y

Re: [Python-Dev] hg pull failed

2011-03-06 Thread Georg Brandl
On 06.03.2011 18:45, s...@pobox.com wrote: > > Nick> Given the recommended workflow in the devguide (i.e. when forward > Nick> porting bug fixes, update all public branches in a single push), > Nick> keeping the transitive connections between local clones is > Nick> probably a good

Re: [Python-Dev] hg pull failed

2011-03-06 Thread Georg Brandl
On 06.03.2011 18:39, s...@pobox.com wrote: > > Nick> Transitive. This is nice for the patch flow (fix in oldest, push, > Nick> switch to next, merge, commit and push, etc, then only touch the > Nick> central server for the final push of all branches), but it does > Nick> you mean y

Re: [Python-Dev] hg pull failed

2011-03-06 Thread skip
Nick> Given the recommended workflow in the devguide (i.e. when forward Nick> porting bug fixes, update all public branches in a single push), Nick> keeping the transitive connections between local clones is Nick> probably a good idea. It also means that we can do the full Nick

Re: [Python-Dev] hg pull failed

2011-03-06 Thread skip
Georg> If you don't change repo configuration after these commands, "hg Georg> pull" in the 3.2 repo will pull from the local cpython repo. I'd Georg> advise to set the "default" entry in each of the clones' .hg/hgrc Georg> file to http://hg.python.org/cpython (as a committer you

Re: [Python-Dev] hg pull failed

2011-03-06 Thread skip
Nick> Transitive. This is nice for the patch flow (fix in oldest, push, Nick> switch to next, merge, commit and push, etc, then only touch the Nick> central server for the final push of all branches), but it does Nick> you mean you need to follow the reverse order when grabbing

Re: [Python-Dev] hg pull failed

2011-03-06 Thread Georg Brandl
On 06.03.2011 17:15, Nick Coghlan wrote: > On Mon, Mar 7, 2011 at 2:07 AM, Georg Brandl wrote: >> If you don't change repo configuration after these commands, "hg pull" in the >> 3.2 repo will pull from the local cpython repo. I'd advise to set the >> "default" >> entry in each of the clones' .h

Re: [Python-Dev] hg pull failed

2011-03-06 Thread Nick Coghlan
On Mon, Mar 7, 2011 at 2:07 AM, Georg Brandl wrote: > If you don't change repo configuration after these commands, "hg pull" in the > 3.2 repo will pull from the local cpython repo.  I'd advise to set the > "default" > entry in each of the clones' .hg/hgrc file to http://hg.python.org/cpython > (

Re: [Python-Dev] hg pull failed

2011-03-06 Thread Nick Coghlan
On Mon, Mar 7, 2011 at 1:44 AM, wrote: > >    Georg> Yesterday's repository was still the test repository, now it's >    Georg> the real one.  You'll need to clone again. > > Thanks. > > I have a question about updates from cloned clones.  Suppose I clone the > central repo then clone locally to

Re: [Python-Dev] hg pull failed

2011-03-06 Thread Georg Brandl
On 06.03.2011 16:44, s...@pobox.com wrote: > > Georg> Yesterday's repository was still the test repository, now it's > Georg> the real one. You'll need to clone again. > > Thanks. > > I have a question about updates from cloned clones. Suppose I clone the > central repo then clone loca

Re: [Python-Dev] hg pull failed

2011-03-06 Thread skip
Georg> Yesterday's repository was still the test repository, now it's Georg> the real one. You'll need to clone again. Thanks. I have a question about updates from cloned clones. Suppose I clone the central repo then clone locally to get the 2.7 and 3.2 release branches: hg clone

Re: [Python-Dev] hg pull failed

2011-03-05 Thread Martin v. Löwis
Am 05.03.2011 17:14, schrieb s...@pobox.com: > Yesterday I cloned the hg cpython repository and made several local copies > for various maintenance releases. This morning I tried to hg pull my > cpython repo to get any changes (not really expecting any), but got this > output: > > % hg pull >

Re: [Python-Dev] hg pull failed

2011-03-05 Thread Georg Brandl
On 05.03.2011 17:14, s...@pobox.com wrote: > Yesterday I cloned the hg cpython repository and made several local copies > for various maintenance releases. This morning I tried to hg pull my > cpython repo to get any changes (not really expecting any), but got this > output: > > % hg pull >

[Python-Dev] hg pull failed

2011-03-05 Thread skip
Yesterday I cloned the hg cpython repository and made several local copies for various maintenance releases. This morning I tried to hg pull my cpython repo to get any changes (not really expecting any), but got this output: % hg pull pulling from http://hg.python.org/cpython searchin