Re: [Python-Dev] Using feature branches for local development

2011-03-13 Thread Éric Araujo
tl;dr: +1 for pushing only clean changesets. Le 13/03/2011 14:44, Antoine Pitrou a écrit : > I think we (python-dev) will need to take a decision on this. > > My personal opinion is that we don't want to see all intermediate > commits which led to a patch (or feature) in the main repo. It may > a

Re: [Python-Dev] Using feature branches for local development

2011-03-13 Thread Stephen J. Turnbull
On Sun, Mar 13, 2011 at 9:32 PM, Eli Bendersky wrote: > The way to do this, IMHO, is just create a local clone and work on it. Then > you can keep checking partial changes in without ever worrying about > accidentally modifying the official repo. Especially if some of this work is > experimental

Re: [Python-Dev] Using feature branches for local development

2011-03-13 Thread Stephen J. Turnbull
On Sun, Mar 13, 2011 at 9:05 PM, Nick Coghlan wrote: > On Sun, Mar 13, 2011 at 7:56 AM, Stephen J. Turnbull > wrote: >> You may *want* to do that, but hg branch obsolete-branch; >> hg commit -m "I'm done" --close should also do the trick of getting >> it out of the way of most commands. > > Ala

Re: [Python-Dev] Using feature branches for local development

2011-03-13 Thread Benjamin Peterson
2011/3/13 Antoine Pitrou : > On Sun, 13 Mar 2011 09:28:28 -0400 > Nick Coghlan wrote: >> >> > The mercurial-recommended way is that you just push your changes to cpython >> > when done, which puts all your individual commits into Python's history. >> > >> > I tried to find an official statement on

Re: [Python-Dev] Using feature branches for local development

2011-03-13 Thread Antoine Pitrou
On Sun, 13 Mar 2011 09:28:28 -0400 Nick Coghlan wrote: > > > The mercurial-recommended way is that you just push your changes to cpython > > when done, which puts all your individual commits into Python's history. > > > > I tried to find an official statement on which way it should be in the > >

Re: [Python-Dev] Using feature branches for local development

2011-03-13 Thread Nick Coghlan
On Sun, Mar 13, 2011 at 8:47 AM, "Martin v. Löwis" wrote: > Am 13.03.11 07:25, schrieb Nick Coghlan: >> 2. Once I'm done with the feature branch, I need to nuke it somehow >> (e.g. by enabling the mq extension to gain access to "hg strip" >> command) > > I think this will need reconsidertion. Appa

Re: [Python-Dev] Using feature branches for local development

2011-03-13 Thread Eli Bendersky
On Sun, Mar 13, 2011 at 14:41, Nick Coghlan wrote: > On Sun, Mar 13, 2011 at 8:32 AM, Eli Bendersky wrote: > > The way to do this, IMHO, is just create a local clone and work on it. > Then > > you can keep checking partial changes in without ever worrying about > > accidentally modifying the off

Re: [Python-Dev] Using feature branches for local development

2011-03-13 Thread Martin v. Löwis
Am 13.03.11 07:25, schrieb Nick Coghlan: I'm experimenting with creating some local branches for things I'd like to work on during the sprints this week, and have a couple of questions about the associated workflow. 1. While the feature branches are active, is it correct that I can't use a bare

Re: [Python-Dev] Using feature branches for local development

2011-03-13 Thread Nick Coghlan
On Sun, Mar 13, 2011 at 8:32 AM, Eli Bendersky wrote: > The way to do this, IMHO, is just create a local clone and work on it. Then > you can keep checking partial changes in without ever worrying about > accidentally modifying the official repo. Especially if some of this work is > experimental a

Re: [Python-Dev] Using feature branches for local development

2011-03-13 Thread Eli Bendersky
On Sun, Mar 13, 2011 at 13:25, Nick Coghlan wrote: > I'm experimenting with creating some local branches for things I'd > like to work on during the sprints this week, and have a couple of > questions about the associated workflow. > The way to do this, IMHO, is just create a local clone and wor

Re: [Python-Dev] Using feature branches for local development

2011-03-13 Thread Nick Coghlan
On Sun, Mar 13, 2011 at 7:56 AM, Stephen J. Turnbull wrote: >> 2. Once I'm done with the feature branch, I need to nuke it somehow >> (e.g. by enabling the mq extension to gain access to "hg strip" >> command) > > You may *want* to do that, but hg branch obsolete-branch; > hg commit -m "I'm done"

Re: [Python-Dev] Using feature branches for local development

2011-03-13 Thread Dirkjan Ochtman
On Sun, Mar 13, 2011 at 12:25, Nick Coghlan wrote: > I'm experimenting with creating some local branches for things I'd > like to work on during the sprints this week, and have a couple of > questions about the associated workflow. By local branches, do you mean named branches (using the hg branc

Re: [Python-Dev] Using feature branches for local development

2011-03-13 Thread Stephen J. Turnbull
On Sun, Mar 13, 2011 at 8:25 PM, Nick Coghlan wrote: > 1. While the feature branches are active, is it correct that I can't > use a bare "hg push" any more, since I don't want to push the feature > branches to hg.python.org? Instead, I need to name all the branches I > want to push explicitly. M

[Python-Dev] Using feature branches for local development

2011-03-13 Thread Nick Coghlan
I'm experimenting with creating some local branches for things I'd like to work on during the sprints this week, and have a couple of questions about the associated workflow. 1. While the feature branches are active, is it correct that I can't use a bare "hg push" any more, since I don't want to p