Jesus Cea wrote:
> On 12/11/11 16:56, Éric Araujo wrote:
> > Ezio and I chatted a bit about his on IRC and he may try to write
> > a Python parser for Misc/NEWS in order to write a fully automated
> > merge tool.
>
> Anything new in this front? :-)
I don't see what's the problem really. The most
2011/11/25 Raymond Hettinger :
> To me, it would make more sense to split the file into a Misc/NEWS3.2 and
> Misc/NEWS3.3 much as we've done with whatsnew. That would make merging a
> piece of cake and would avoid adding a parser (an its idiosyncracies) to the
> toolchain.
Would we not add fixes
Le 26/11/2011 06:29, Nick Coghlan a écrit :
> On Sat, Nov 26, 2011 at 3:14 PM, Raymond Hettinger wrote:
>> To me, it would make more sense to split the file into a Misc/NEWS3.2 and
>> Misc/NEWS3.3 much as we've done with whatsnew. That would make merging a
>> piece of cake and would avoid adding a
Le 26/11/2011 03:18, Jesus Cea a écrit :
> On 12/11/11 16:56, Éric Araujo wrote:
>> Ezio and I chatted a bit about his on IRC and he may try to write
>> a Python parser for Misc/NEWS in order to write a fully automated
>> merge tool.
> Anything new in this front? :-)
Not from me. I don’t have th
On Sat, Nov 26, 2011 at 3:14 PM, Raymond Hettinger
wrote:
>
> On Nov 25, 2011, at 6:18 PM, Jesus Cea wrote:
>
> On 12/11/11 16:56, Éric Araujo wrote:
>
> Ezio and I chatted a bit about his on IRC and he may try to write
>
> a Python parser for Misc/NEWS in order to write a fully automated
>
> merg
On Nov 25, 2011, at 6:18 PM, Jesus Cea wrote:
> On 12/11/11 16:56, Éric Araujo wrote:
>> Ezio and I chatted a bit about his on IRC and he may try to write
>> a Python parser for Misc/NEWS in order to write a fully automated
>> merge tool.
>
> Anything new in this front? :-)
To me, it would make
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1
On 12/11/11 16:56, Éric Araujo wrote:
> Ezio and I chatted a bit about his on IRC and he may try to write
> a Python parser for Misc/NEWS in order to write a fully automated
> merge tool.
Anything new in this front? :-)
- --
Jesus Cea Avion
Hi,
My usual merge tool is vimdiff, with a little configuration so that it
shows only two panes instead of three (destination file on the left,
file from the other branch on the right, and if I need to compare either
with the common ancestor to see which chunks I want from each file, I
use a
On Thu, 10 Nov 2011 12:49:48 +0900
"Stephen J. Turnbull" wrote:
>
> > A bit of discipline and, voila, automatic flawless merges! :-)
>
> Doesn't work that way, sorry. The discipline required is isomorphic to
> that required by threaded programs. See multiple threads on
> python-ideas for why t
Jesus Cea writes:
> A bit of discipline and, voila, automatic flawless merges! :-)
Doesn't work that way, sorry. The discipline required is isomorphic to
that required by threaded programs. See multiple threads on
python-ideas for why that is less than automatic or flawless. :-)
Antoine's sugg
On Thu, Nov 10, 2011 at 8:32 AM, Antoine Pitrou wrote:
> FYI, Twisted has chosen a totally different approach:
> http://twistedmatrix.com/trac/wiki/ReviewProcess#Newsfiles
>
> “[...] If we just let each author add to the NEWS files on every
> commit, though, we would run into lots of spurious conf
On Wed, 09 Nov 2011 23:21:35 +0100
Jesus Cea wrote:
>
> On 08/11/11 19:51, Terry Reedy wrote:
> > If a bug is fixed in 3.2.latest, then it will not be new in 3.3.0,
> > so perhaps it should not be added there. NEWS could just refer back
> > to previous sections. Then 3.3.0 News would only be new
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1
On 09/11/11 12:28, Nick Coghlan wrote:
> The 3.2.x maintenance release sections are not present in the 3.3
> NEWS file - it jumps straight from 3.2 to 3.3a1.
>
> So bug fixes should be recorded in both places - the 3.3a1 notes
> record the deltas aga
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1
On 08/11/11 19:51, Terry Reedy wrote:
> If a bug is fixed in 3.2.latest, then it will not be new in 3.3.0,
> so perhaps it should not be added there. NEWS could just refer back
> to previous sections. Then 3.3.0 News would only be new features
> and th
On Thu, Nov 10, 2011 at 5:14 AM, Terry Reedy wrote:
> On 11/9/2011 6:28 AM, Nick Coghlan wrote:
>
>> So bug fixes should be recorded in both places - the 3.3a1 notes
>> record the deltas against 3.2.0, not against whatever the latest
>> release of 3.2 happens to be when 3.3 is released.
>
> OK, I
On 11/9/2011 6:28 AM, Nick Coghlan wrote:
So bug fixes should be recorded in both places - the 3.3a1 notes
record the deltas against 3.2.0, not against whatever the latest
release of 3.2 happens to be when 3.3 is released.
OK, I see that now.
Idea 2: If "What's New in Python 3.3 Alpha 1?" had
On Wed, Nov 9, 2011 at 4:51 AM, Terry Reedy wrote:
> If a bug is fixed in 3.2.latest, then it will not be new in 3.3.0, so
> perhaps it should not be added there. NEWS could just refer back to previous
> sections. Then 3.3.0 News would only be new features and the occasional
> ambiguous item not f
On Tue, 08 Nov 2011 13:51:44 -0500
Terry Reedy wrote:
> On 11/8/2011 10:49 AM, Jesus Cea wrote:
> > -BEGIN PGP SIGNED MESSAGE-
> > Hash: SHA1
> >
> > When merging from 3.2 to 3.3 "Misc/NEWS" always conflicts (lately).
> > Instead of copy&paste the test manually between versions, has anybod
Terry Reedy wrote:
> On 11/8/2011 10:49 AM, Jesus Cea wrote:
> >-BEGIN PGP SIGNED MESSAGE-
> >Hash: SHA1
> >
> >When merging from 3.2 to 3.3 "Misc/NEWS" always conflicts (lately).
> >Instead of copy&paste the test manually between versions, has anybody
> >a better workflow?.
>
> If a bug i
On 09Nov2011 07:19, I wrote:
| Yes it does. I use this facility to merge timesheet files mainatined on
| separate hosts (home machine, travelling laptop) in my hgbox script.
| The hgrc says:
|
| [merge-patterns]
| timesheets-cameron/2* = merge-dumb
| dailylog-cameron/2*/[A-Z]* = merge-dumb
|
On 08Nov2011 13:50, Barry Warsaw wrote:
| On Nov 08, 2011, at 04:49 PM, Jesus Cea wrote:
| >When merging from 3.2 to 3.3 "Misc/NEWS" always conflicts (lately).
| >Instead of copy&paste the test manually between versions, has anybody
| >a better workflow?.
|
| Does Mercurial support custom merge p
On 11/8/2011 10:49 AM, Jesus Cea wrote:
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1
When merging from 3.2 to 3.3 "Misc/NEWS" always conflicts (lately).
Instead of copy&paste the test manually between versions, has anybody
a better workflow?.
If a bug is fixed in 3.2.latest, then it will not
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256
On Nov 08, 2011, at 04:49 PM, Jesus Cea wrote:
>When merging from 3.2 to 3.3 "Misc/NEWS" always conflicts (lately).
>Instead of copy&paste the test manually between versions, has anybody
>a better workflow?.
Does Mercurial support custom merge plug
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1
When merging from 3.2 to 3.3 "Misc/NEWS" always conflicts (lately).
Instead of copy&paste the test manually between versions, has anybody
a better workflow?.
Since any change applied to 3.2 should be applied to 3.3 too (except
very few cases), Mercuri
24 matches
Mail list logo
