Re: [Python-Dev] PEP: Collecting information about git

2015-09-16 Thread Nikolaus Rath
On Sep 16 2015, Terry Reedy wrote: > On 9/16/2015 5:20 AM, Oleg Broytman wrote: > >> On Tue, Sep 15, 2015 at 07:44:28PM +, Augie Fackler >> wrote: > >>> There are a lot of reasons to prefer one tool over another. Common ones are >>> familiarity, simplicity, and power. >> >> Add here docu

Re: [Python-Dev] PEP: Collecting information about git

2015-09-16 Thread Nikolaus Rath
On Sep 16 2015, Nikolaus Rath wrote: > On Sep 16 2015, "R. David Murray" wrote: >> On Wed, 16 Sep 2015 09:17:38 -0700, Nikolaus Rath wrote: >>> On Sep 16 2015, "R. David Murray" wrote: >>> > The DAG plus git branches-as-labels *fits in my head* in a way that the >>> > DAG plus named-branches-an

Re: [Python-Dev] PEP: Collecting information about git

2015-09-16 Thread Stephen J. Turnbull
Nikolaus Rath writes: > On Sep 17 2015, "Stephen J. Turnbull" wrote: > > Nikolaus Rath writes: > > > > > Hmm, that's odd. As far as I know, the difference between the hg and git > > > DAG model can be summarized like this: > > > > > > * In git, leaves of the DAG must be assigned a nam

Re: [Python-Dev] PEP: Collecting information about git

2015-09-16 Thread Stephen J. Turnbull
Nikolaus Rath writes: > >> * hg named branches have no equivalent in git. > >> > >> Does that help? > > > > Well, that last bullet kind of complicates the model, doesn't it? :) > > Not if you come from git and want to use hg. You can just ignore > bookmarks. No, you cannot just ignor

Re: [Python-Dev] PEP: Collecting information about git

2015-09-16 Thread Terry Reedy
On 9/16/2015 5:20 AM, Oleg Broytman wrote: On Tue, Sep 15, 2015 at 07:44:28PM +, Augie Fackler wrote: There are a lot of reasons to prefer one tool over another. Common ones are familiarity, simplicity, and power. Add here documentation, speed, availability of extensions and 3rd-p

Re: [Python-Dev] PEP: Collecting information about git

2015-09-16 Thread Terry Reedy
On 9/15/2015 10:14 PM, Augie Fackler wrote: (Note that I'm not subbed to python-devel, so you'll get faster service by leaving me cc'ed on the thread.) I am not either, because I read and post (since its beginning) via the gmane.comp.python.devel mirror at news.gmane.org. Choose newsgroup or

Re: [Python-Dev] PEP: Collecting information about git

2015-09-16 Thread Nikolaus Rath
On Sep 17 2015, "Stephen J. Turnbull" wrote: > Nikolaus Rath writes: > > > Hmm, that's odd. As far as I know, the difference between the hg and git > > DAG model can be summarized like this: > > > > * In git, leaves of the DAG must be assigned a name. If they don't have > >a name, they

Re: [Python-Dev] PEP: Collecting information about git

2015-09-16 Thread Nikolaus Rath
On Sep 16 2015, "R. David Murray" wrote: > On Wed, 16 Sep 2015 09:17:38 -0700, Nikolaus Rath wrote: >> On Sep 16 2015, "R. David Murray" wrote: >> > The DAG plus git branches-as-labels *fits in my head* in a way that the >> > DAG plus named-branches-and-other-things does not. >> >> Hmm, that's

Re: [Python-Dev] [Numpy-discussion] The process I intend to follow for any proposed changes to NumPy

2015-09-16 Thread Nathaniel Smith
Hi all, Thanks, Travis, for the followup. I know some people were confused or concerned by some points in Travis’s recent emails (as was I, initially), but after checking in with Travis and the NumPy steering council, it sounds like the main points of possible confusion are actually things where w

Re: [Python-Dev] PEP: Collecting information about git

2015-09-16 Thread Nikolaus Rath
On Sep 16 2015, Paul Moore wrote: > I'm on revision X, which is at tip (master in git, the default branch > in Mercurial). I do git checkout -b foo (or hg bookmark foo). Now I > check in some changes. In git, I'm on branch foo and I can go back to > master with git checkout master. In Mercurial, I

Re: [Python-Dev] PEP: Collecting information about git

2015-09-16 Thread Augie Fackler
Nikolaus Rath rath.org> writes: > > On Sep 16 2015, Paul Moore gmail.com> wrote: > > On 16 September 2015 at 06:10, Stephen J. Turnbull xemacs.org> wrote: > > In general you can do that by configuring the repository with > > [phases] > publish = False > > However, I believe BitB

Re: [Python-Dev] PEP: Collecting information about git

2015-09-16 Thread Pierre-Yves David
On 09/16/2015 02:20 AM, Oleg Broytman wrote: Hi! On Tue, Sep 15, 2015 at 07:44:28PM +, Augie Fackler wrote: Hi! I work on Mercurial. I???ve got some inline responses, but I want to summarize and put this in context for those without much energy for the topic. Thank you! There ar

Re: [Python-Dev] PEP: Collecting information about git

2015-09-16 Thread Pierre-Yves David
(wonderfully forgot to address the point that triggered reply) On 09/16/2015 02:20 AM, Oleg Broytman wrote: Oleg Broytman phdru.name> writes: With git we can have per-directory .gitignore and .gitattributes. No per-directory .hgignore? Never? Quite useful in a big project where subprojec

Re: [Python-Dev] congrats on 3.5! Alas, windows 7 users are having problems installing it

2015-09-16 Thread Laura Creighton
In a message of Wed, 16 Sep 2015 16:56:54 -, Brett Cannon writes: >I don't see any issue opened about Windows 7 installation issues, so if >someone who has had the issue can thus can help Steve diagnose the problem >that would be great (Steve is also currently on vacation so having this all >in

Re: [Python-Dev] PEP: Collecting information about git

2015-09-16 Thread Augie Fackler
Nikolaus Rath rath.org> writes: > > On Sep 16 2015, Chris Angelico gmail.com> wrote: > > With git, there are infinite workflows possible - you aren't forced to > > have a concept of "central server" and "clients" the way you would > > with SVN. Mercurial's called a DVCS too, so presumably it's

Re: [Python-Dev] PEP: Collecting information about git

2015-09-16 Thread Paul Moore
On 16 September 2015 at 17:10, Nikolaus Rath wrote: >> I don't know of an equivalent of remote tracking branches in >> Mercurial. Maybe bookmarks work that way by default? > > Where exactly did you run into problems? I think you should have gotten > the same result with the following hg commands (

Re: [Python-Dev] PEP: Collecting information about git

2015-09-16 Thread Stephen J. Turnbull
Nikolaus Rath writes: > Hmm, that's odd. As far as I know, the difference between the hg and git > DAG model can be summarized like this: > > * In git, leaves of the DAG must be assigned a name. If they don't have >a name, they will be garbage collected. You can turn off automatic garb

Re: [Python-Dev] PEP: Collecting information about git

2015-09-16 Thread R. David Murray
On Wed, 16 Sep 2015 09:17:38 -0700, Nikolaus Rath wrote: > On Sep 16 2015, "R. David Murray" wrote: > > The DAG plus git branches-as-labels *fits in my head* in a way that the > > DAG plus named-branches-and-other-things does not. > > Hmm, that's odd. As far as I know, the difference between the

Re: [Python-Dev] congrats on 3.5! Alas, windows 7 users are having problems installing it

2015-09-16 Thread Brett Cannon
I don't see any issue opened about Windows 7 installation issues, so if someone who has had the issue can thus can help Steve diagnose the problem that would be great (Steve is also currently on vacation so having this all in a bug that he can read when he gets back would also help). On Wed, 16 Se

Re: [Python-Dev] PEP: Collecting information about git

2015-09-16 Thread Nikolaus Rath
On Sep 16 2015, "R. David Murray" wrote: > The DAG plus git branches-as-labels *fits in my head* in a way that the > DAG plus named-branches-and-other-things does not. Hmm, that's odd. As far as I know, the difference between the hg and git DAG model can be summarized like this: * In git, leave

Re: [Python-Dev] PEP: Collecting information about git

2015-09-16 Thread Nikolaus Rath
On Sep 16 2015, Chris Angelico wrote: > With git, there are infinite workflows possible - you aren't forced to > have a concept of "central server" and "clients" the way you would > with SVN. Mercurial's called a DVCS too, so presumably it's possible > to operate on a pure-peering model with no ce

Re: [Python-Dev] PEP: Collecting information about git

2015-09-16 Thread Nikolaus Rath
On Sep 16 2015, Paul Moore wrote: > On 16 September 2015 at 06:10, Stephen J. Turnbull wrote: >> The only thing that hg really lost badly on >> IMO was "named branches", and that's been fixed with bookmarks. > > FWIW, I still find bookmarks confusing to use compared to git > branches. I don't k

Re: [Python-Dev] PEP: Collecting information about git

2015-09-16 Thread Augie Fackler
Oleg Broytman phdru.name> writes: > > Hi! > > On Tue, Sep 15, 2015 at 07:44:28PM +, Augie Fackler durin42.com> wrote: > > Hi! I work on Mercurial. I???ve got some inline responses, but I want to > > summarize and put this in context for those without much energy for the topic. > >Than

Re: [Python-Dev] PEP: Collecting information about git

2015-09-16 Thread Barry Warsaw
On Sep 16, 2015, at 09:34 AM, R. David Murray wrote: >My experience with DVCS started with bazaar, moved on to hg for the >CPython project, and finally git. Through all of that I did not >understand the DAG, and had trouble wrapping my mind around what was >going on, despite being able to get thi

Re: [Python-Dev] PEP: Collecting information about git

2015-09-16 Thread R. David Murray
On Wed, 16 Sep 2015 19:59:28 +1000, Chris Angelico wrote: > On Wed, Sep 16, 2015 at 7:46 PM, Oleg Broytman wrote: > > For example, I develop > > SQLObject using two private clones (clean backup repo and dirty working > > repo) and three public clones at Gitlab, GutHub and SourceForge. They > > ar

Re: [Python-Dev] PEP: Collecting information about git

2015-09-16 Thread Chris Angelico
On Wed, Sep 16, 2015 at 7:46 PM, Oleg Broytman wrote: > For example, I develop > SQLObject using two private clones (clean backup repo and dirty working > repo) and three public clones at Gitlab, GutHub and SourceForge. They > are all equal, none of them is the upstream. I don't even have > ``orig

Re: [Python-Dev] PEP: Collecting information about git

2015-09-16 Thread Nick Coghlan
On 16 Sep 2015 18:48, "Paul Moore" wrote: > > On 16 September 2015 at 06:10, Stephen J. Turnbull wrote: > > The only thing that hg really lost badly on > > IMO was "named branches", and that's been fixed with bookmarks. > > FWIW, I still find bookmarks confusing to use compared to git > branche

Re: [Python-Dev] PEP: Collecting information about git

2015-09-16 Thread Oleg Broytman
On Wed, Sep 16, 2015 at 07:27:12PM +1000, Chris Angelico wrote: > On Wed, Sep 16, 2015 at 7:20 PM, Oleg Broytman wrote: > >Thanks. I think upstream remote-tracking branches in git are rather > > similar. If one's afraid of rewriting published history she should never > > rebase before @{u}.

Re: [Python-Dev] congrats on 3.5! Alas, windows 7 users are having problems installing it

2015-09-16 Thread Giampaolo Rodola'
Same here. I get a "0x80240017 error" during installation. On Sun, Sep 13, 2015 at 10:41 PM, Laura Creighton wrote: > webmaster has already heard from 4 people who cannot install it. > I sent them to the bug tracker or to python-list but they seem > not to have gone either place. Is there some

Re: [Python-Dev] PEP: Collecting information about git

2015-09-16 Thread Chris Angelico
On Wed, Sep 16, 2015 at 7:20 PM, Oleg Broytman wrote: >Thanks. I think upstream remote-tracking branches in git are rather > similar. If one's afraid of rewriting published history she should never > rebase before @{u}. Just always using ``git rebase -i @{u}`` should be > good enough. >The

Re: [Python-Dev] PEP: Collecting information about git

2015-09-16 Thread Oleg Broytman
Hi! On Tue, Sep 15, 2015 at 07:44:28PM +, Augie Fackler wrote: > Hi! I work on Mercurial. I???ve got some inline responses, but I want to > summarize and put this in context for those without much energy for the topic. Thank you! > There are a lot of reasons to prefer one tool over anot

Re: [Python-Dev] PEP: Collecting information about git

2015-09-16 Thread Paul Moore
On 16 September 2015 at 06:10, Stephen J. Turnbull wrote: > The only thing that hg really lost badly on > IMO was "named branches", and that's been fixed with bookmarks. FWIW, I still find bookmarks confusing to use compared to git branches. I don't know whether that's because bitbucket doesn't