I was trying to do a simple merge of a doc change between 3.3 and
default and the usual Misc/NEWS conflict came up. But when I looked at
the diff it was massive! Turns out that Misc/NEWS in default goes from
3.3.1rc1 to 3.4.0a1
(http://hg.python.org/cpython/file/24ffb0148729/Misc/NEWS) while
On Fri, May 24, 2013 at 10:24 PM, Brett Cannon br...@python.org wrote:
I was trying to do a simple merge of a doc change between 3.3 and
default and the usual Misc/NEWS conflict came up. But when I looked at
the diff it was massive! Turns out that Misc/NEWS in default goes from
3.3.1rc1 to
24.05.13 15:24, Brett Cannon написав(ла):
I was trying to do a simple merge of a doc change between 3.3 and
default and the usual Misc/NEWS conflict came up. But when I looked at
the diff it was massive! Turns out that Misc/NEWS in default goes from
3.3.1rc1 to 3.4.0a1
On Fri, May 24, 2013 at 9:00 AM, Nick Coghlan ncogh...@gmail.com wrote:
On Fri, May 24, 2013 at 10:24 PM, Brett Cannon br...@python.org wrote:
I was trying to do a simple merge of a doc change between 3.3 and
default and the usual Misc/NEWS conflict came up. But when I looked at
the diff it
Brett wrote:
Of course, we've talked about doing something like this before, it's
just never irritated anyone enough for them to sit down and *write*
the associated NEWS file generator, or the code to split the existing
NEWS file for the active branches :)
I think that's overly complicated.
On Fri, 24 May 2013 18:39:16 +0200, Antoine Pitrou solip...@pitrou.net
wrote:
Brett wrote:
Of course, we've talked about doing something like this before, it's
just never irritated anyone enough for them to sit down and *write*
the associated NEWS file generator, or the code to split the
On 5/24/2013 8:24 AM, Brett Cannon wrote:
I was trying to do a simple merge of a doc change between 3.3 and
default and the usual Misc/NEWS conflict came up.
I have had things like this happen and after pain iwth kdiff3 just
edited the default version
But when I looked at
the diff it was
On Fri, May 24, 2013 at 12:39 PM, Antoine Pitrou solip...@pitrou.net wrote:
Brett wrote:
Of course, we've talked about doing something like this before, it's
just never irritated anyone enough for them to sit down and *write*
the associated NEWS file generator, or the code to split the
Le vendredi 24 mai 2013 à 14:23 -0400, Brett Cannon a écrit :
You'll have to copy stuff by hand, though, if you don't want to rely on the
merge machinery. So we have two possible file layouts:
* (current) a single Misc/NEWS is merged from branch to branch. Pro: hg
merge
copies the
On Fri, May 24, 2013 at 2:27 PM, Antoine Pitrou solip...@pitrou.net wrote:
Le vendredi 24 mai 2013 à 14:23 -0400, Brett Cannon a écrit :
You'll have to copy stuff by hand, though, if you don't want to rely on the
merge machinery. So we have two possible file layouts:
* (current) a single
Le vendredi 24 mai 2013 à 15:26 -0400, Brett Cannon a écrit :
Either way the status quo makes me not want to fix small doc typos
like a missing parenthesis since this is enough of a hassle to not
make it worth it.
Do you mean Mics/NEWS doc typos?
No I mean typos in the docs. For
On 5/24/2013 9:00 AM, Nick Coghlan wrote:
On Fri, May 24, 2013 at 10:24 PM, Brett Cannon br...@python.org wrote:
would be great. And maybe it's finally time to bite the bullet and
come up with some way to automatically generate Misc/NEWS from commit
messages.
No, commit messages do not a NEWS
On Fri, 24 May 2013 15:26:29 -0400, Brett Cannon br...@python.org wrote:
On Fri, May 24, 2013 at 2:27 PM, Antoine Pitrou solip...@pitrou.net wrote:
Le vendredi 24 mai 2013 à 14:23 -0400, Brett Cannon a écrit :
You'll have to copy stuff by hand, though, if you don't want to rely on
the
On Fri, May 24, 2013 at 3:54 PM, Antoine Pitrou solip...@pitrou.net wrote:
Le vendredi 24 mai 2013 à 15:26 -0400, Brett Cannon a écrit :
Either way the status quo makes me not want to fix small doc typos
like a missing parenthesis since this is enough of a hassle to not
make it worth it.
Another replay that did not show up on list.
On 5/24/2013 9:00 AM, Nick Coghlan wrote:
On Fri, May 24, 2013 at 10:24 PM, Brett Cannon br...@python.org wrote:
would be great. And maybe it's finally time to bite the bullet and
come up with some way to automatically generate Misc/NEWS from commit
On May 24, 2013 2:26 PM, Benjamin Peterson benja...@python.org wrote:
2013/5/24 Brett Cannon br...@python.org:
It's an extreme example, but for instance I added an entry for this
sys.modules change where I just added a clarifying sentence. Probably
not needed but wanted to make sure that
On Fri, 24 May 2013 15:16:24 -0600, Gregory P. Smith g...@krypto.org wrote:
On May 24, 2013 2:55 PM, Antoine Pitrou solip...@pitrou.net wrote:
Le vendredi 24 mai 2013 à 16:22 -0400, Brett Cannon a écrit :
I don't understand why it's painful to backport. Can you explain?
If I
On 25 May 2013 13:05, R. David Murray rdmur...@bitdance.com wrote:
On Fri, 24 May 2013 15:16:24 -0600, Gregory P. Smith g...@krypto.org
wrote:
On May 24, 2013 2:55 PM, Antoine Pitrou solip...@pitrou.net wrote:
Le vendredi 24 mai 2013 à 16:22 -0400, Brett Cannon a écrit :
I
18 matches
Mail list logo
