Re: [Python-Dev] Commit changelog: issue number and merges

2011-05-11 Thread Éric Araujo
Le 09/05/2011 19:54, R. David Murray a écrit : No it isn't. The commit message isn't pulled into the new branch. Sorry, your terminology does not make sense. If you mean that the commit message is not reused in the new commit after the merge, it’s true. However, the commit message with

Re: [Python-Dev] Commit changelog: issue number and merges

2011-05-10 Thread Aurélien Campéas
Le 10/05/2011 04:51, Stephen J. Turnbull a écrit : R. David Murray writes: On Mon, 09 May 2011 18:23:45 -0500, Benjamin Petersonbenja...@python.org wrote: *cough* http://mercurial.selenic.com/wiki/GraphlogExtension I'm sorry, but I've looked at the output of that and the

Re: [Python-Dev] Commit changelog: issue number and merges

2011-05-10 Thread R. David Murray
On Tue, 10 May 2011 11:51:19 +0900, Stephen J. Turnbull step...@xemacs.org wrote: R. David Murray writes: On Mon, 09 May 2011 18:23:45 -0500, Benjamin Peterson benja...@python.org wrote: *cough* http://mercurial.selenic.com/wiki/GraphlogExtension I'm sorry, but I've looked at

Re: [Python-Dev] Commit changelog: issue number and merges

2011-05-10 Thread Nick Coghlan
On Tue, May 10, 2011 at 12:51 PM, Stephen J. Turnbull step...@xemacs.org wrote: R. David Murray writes:   On Mon, 09 May 2011 18:23:45 -0500, Benjamin Peterson benja...@python.org wrote:   *cough* http://mercurial.selenic.com/wiki/GraphlogExtension     I'm sorry, but I've looked at the

Re: [Python-Dev] Commit changelog: issue number and merges

2011-05-09 Thread R. David Murray
On Mon, 09 May 2011 12:32:48 +0200, Victor Stinner victor.stin...@haypocalc.com wrote: For merge commits: many developers just write merge or merge 3.1. I have to go to the parent commit (and something to the grandparent, 3.1-3.2-3.3) to learn more about the commit. Would it be possible to

Re: [Python-Dev] Commit changelog: issue number and merges

2011-05-09 Thread Senthil Kumaran
On Mon, May 09, 2011 at 08:40:03AM -0400, R. David Murray wrote: +1. What I do is, in the edit window for the commit message, I pull in .hg/last-message.txt, and just type 'Merge' in front of my previous Thanks for this tip. I shall start following this one too. -- Senthil

Re: [Python-Dev] Commit changelog: issue number and merges

2011-05-09 Thread Benjamin Peterson
2011/5/9 Victor Stinner victor.stin...@haypocalc.com: Hi, Commit changelogs are important to understand why the code was changed. I regulary use hg blame to search which commit introduced a particular line of code, and I am always happy if I can find an issue number because it usually

Re: [Python-Dev] Commit changelog: issue number and merges

2011-05-09 Thread Victor Stinner
Le lundi 09 mai 2011 à 09:08 -0500, Benjamin Peterson a écrit : It seems like something that should be solved by tools like a display visual graph indicating what is merged. (like Bazaar) Yeah, we could fix buildbot, hg.python.org website, improve hg log, and all other tools using Mercurial.

Re: [Python-Dev] Commit changelog: issue number and merges

2011-05-09 Thread R. David Murray
On Mon, 09 May 2011 09:08:53 -0500, Benjamin Peterson benja...@python.org wrote: I thought the whole point of merging was that you brought a changeset from one branch to another. This why I just write merge because otherwise you're technically duplicating information that is pulled onto the

Re: [Python-Dev] Commit changelog: issue number and merges

2011-05-09 Thread Éric Araujo
Hi, Le 09/05/2011 16:08, Benjamin Peterson a écrit : 2011/5/9 Victor Stinner victor.stin...@haypocalc.com: For merge commits: many developers just write merge or merge 3.1. I have to go to the parent commit (and something to the grandparent, 3.1-3.2-3.3) to learn more about the commit. I

Re: [Python-Dev] Commit changelog: issue number and merges

2011-05-09 Thread R. David Murray
On Mon, 09 May 2011 17:55:42 +0200, =?UTF-8?Q?=C3=89ric_Araujo?= mer...@netwok.org wrote: Le 09/05/2011 16:08, Benjamin Peterson a écrit : 2011/5/9 Victor Stinner victor.stin...@haypocalc.com: For merge commits: many developers just write merge or merge 3.1. I have to go to the parent

Re: [Python-Dev] Commit changelog: issue number and merges

2011-05-09 Thread Terry Reedy
On 5/9/2011 1:54 PM, R. David Murray wrote: If I do 'hg log' and search for a revno (that I got from hg annotate), the commit message describing the change is not attached to that revno, nor as far as I know is there a tool that makes it easy to get from that revno to the explanatory commit

Re: [Python-Dev] Commit changelog: issue number and merges

2011-05-09 Thread Benjamin Peterson
2011/5/9 R. David Murray rdmur...@bitdance.com: On Mon, 09 May 2011 09:08:53 -0500, Benjamin Peterson benja...@python.org wrote: I thought the whole point of merging was that you brought a changeset from one branch to another. This why I just write merge because otherwise you're technically

Re: [Python-Dev] Commit changelog: issue number and merges

2011-05-09 Thread R. David Murray
On Mon, 09 May 2011 18:23:45 -0500, Benjamin Peterson benja...@python.org wrote: 2011/5/9 R. David Murray rdmur...@bitdance.com: On Mon, 09 May 2011 09:08:53 -0500, Benjamin Peterson benja...@python.or= g wrote: I thought the whole point of merging was that you brought a changeset from

Re: [Python-Dev] Commit changelog: issue number and merges

2011-05-09 Thread Stephen J. Turnbull
R. David Murray writes: On Mon, 09 May 2011 18:23:45 -0500, Benjamin Peterson benja...@python.org wrote: *cough* http://mercurial.selenic.com/wiki/GraphlogExtension I'm sorry, but I've looked at the output of that and the mental overhead has so far proven too high for it to be of