Re: [Python-Dev] [Python-checkins] cpython (2.7): #16004: Add `make touch`.
On 11 Mar 2013 06:23, "Brett Cannon" wrote: > > > > > On Mon, Mar 11, 2013 at 9:22 AM, Brett Cannon wrote: >> >> Should this also touch Python/importlib.h? >> > > nm, noticed this was added on 2.7 and not default. Default already had it, this was a back port so that "make touch" could be given as a consistent fix for certain build problems in the devguide. (Specifically, make trying to rebuild those files when you don't yet have the necessary pieces available to do so) Cheers, Nick. > >> >> >> On Mon, Mar 11, 2013 at 3:14 AM, ezio.melotti wrote: >>> >>> http://hg.python.org/cpython/rev/da3f4774b939 >>> changeset: 82600:da3f4774b939 >>> branch: 2.7 >>> parent: 82593:3e14aafeca04 >>> user:Ezio Melotti >>> date:Mon Mar 11 09:14:09 2013 +0200 >>> summary: >>> #16004: Add `make touch`. >>> >>> files: >>> Makefile.pre.in | 6 +- >>> Misc/NEWS | 2 ++ >>> 2 files changed, 7 insertions(+), 1 deletions(-) >>> >>> >>> diff --git a/Makefile.pre.in b/Makefile.pre.in >>> --- a/Makefile.pre.in >>> +++ b/Makefile.pre.in >>> @@ -1250,6 +1250,10 @@ >>> etags Include/*.h; \ >>> for i in $(SRCDIRS); do etags -a $$i/*.[ch]; done >>> >>> +# Touch generated files >>> +touch: >>> + touch Include/Python-ast.h Python/Python-ast.c >>> + >>> # Sanitation targets -- clean leaves libraries, executables and tags >>> # files, which clobber removes as well >>> pycremoval: >>> @@ -1339,7 +1343,7 @@ >>> .PHONY: frameworkinstall frameworkinstallframework frameworkinstallstructure >>> .PHONY: frameworkinstallmaclib frameworkinstallapps frameworkinstallunixtools >>> .PHONY: frameworkaltinstallunixtools recheck autoconf clean clobber distclean >>> -.PHONY: smelly funny patchcheck altmaninstall >>> +.PHONY: smelly funny patchcheck touch altmaninstall >>> .PHONY: gdbhooks >>> >>> # IF YOU PUT ANYTHING HERE IT WILL GO AWAY >>> diff --git a/Misc/NEWS b/Misc/NEWS >>> --- a/Misc/NEWS >>> +++ b/Misc/NEWS >>> @@ -874,6 +874,8 @@ >>> Build >>> - >>> >>> +- Issue #16004: Add `make touch`. >>> + >>> - Issue #5033: Fix building of the sqlite3 extension module when the >>>SQLite library version has "beta" in it. Patch by Andreas Pelme. >>> >>> >>> -- >>> Repository URL: http://hg.python.org/cpython >>> >>> ___ >>> Python-checkins mailing list >>> [email protected] >>> http://mail.python.org/mailman/listinfo/python-checkins >>> >> > > > ___ > Python-checkins mailing list > [email protected] > http://mail.python.org/mailman/listinfo/python-checkins > ___ Python-Dev mailing list [email protected] http://mail.python.org/mailman/listinfo/python-dev Unsubscribe: http://mail.python.org/mailman/options/python-dev/archive%40mail-archive.com
Re: [Python-Dev] CANNOT Patch 3.x NEWS [was cpython (2.7): Issue #14707: add news entry\
In article <[email protected]>, Terry Reedy wrote: > I have tried deleting the NEWS file and reverting the deletion. > hg update does not restore the file as it apparently thinks I actually > want the uncommitted deletion. I'm not sure exactly the sequence of events here but chances are you ran into the "normal" problem of trying to merge a change that modifies Misc/NEWS. Unless you are very lucky or careful, merging Misc/NEWS changes from, say, 3.2 to 3.3 or 3.3 to default seldom works cleanly. After merging but before committing, you can just revert Misc/NEWS and then manually re-insert the changes. The auto-merge of Misc/NEWS is more often than not useless. -- Ned Deily, [email protected] ___ Python-Dev mailing list [email protected] http://mail.python.org/mailman/listinfo/python-dev Unsubscribe: http://mail.python.org/mailman/options/python-dev/archive%40mail-archive.com
[Python-Dev] Namaste, Python-Dev
Hello, I've just joined Python-Dev and I intend to spend an increasing amount of time contributing to Python. A couple of days back I contributed my first (very) few lines, to the benchmark suite. Incidentally, it was my first contribution ever towards Free Software, and the feeling is incredible! I am truly honoured to be a part of this amazing community, and I hope to serve it well. Regards, Anuj Gupta ___ Python-Dev mailing list [email protected] http://mail.python.org/mailman/listinfo/python-dev Unsubscribe: http://mail.python.org/mailman/options/python-dev/archive%40mail-archive.com
Re: [Python-Dev] Namaste, Python-Dev
Hello Anuj, On Wed, 13 Mar 2013 02:11:54 +0530 Anuj Gupta wrote: > > I've just joined Python-Dev and I intend to spend an increasing amount > of time contributing to Python. A couple of days back I contributed my > first (very) few lines, to the benchmark suite. Incidentally, it was my > first contribution ever towards Free Software, and the feeling is > incredible! Thanks for joining us, and congratulations :-) If you haven't already done so, we have a developers' guide which will help you make further contributions: http://docs.python.org/devguide/ Regards Antoine. ___ Python-Dev mailing list [email protected] http://mail.python.org/mailman/listinfo/python-dev Unsubscribe: http://mail.python.org/mailman/options/python-dev/archive%40mail-archive.com
Re: [Python-Dev] [Python-checkins] CANNOT Patch 3.x NEWS [was cpython (2.7): Issue #14707: add news entry\
Hi,
On Tue, Mar 12, 2013 at 7:19 PM, Terry Reedy wrote:
> On 3/12/2013 2:52 AM, Ezio Melotti wrote:
>> What are the exact commands you used?
>
> Clicks on TortoiseHg HgWorkbench GUI ;-).
>
I wonder if TortoiseHg is doing something wrong here. Maybe you could
try from cmd too.
>> Are your clones up to date (i.e. did you do "hg pull" and "hg up"
>> before "hg graft")?
>
> There were no other pushes between my last de-double patch and this, and I
> am sure I ran my pull + 3*update .bat first. I have run it multiple times
> since.
>
Around the time you pushed on 2.7 I also pushed something, so that
might have created some conflict.
How does your .bat look like? One gotcha of the share extension is
that if you use "hg pull -u" and there's nothing to pull because you
already pulled in one of the shared clones, the update won't be
executed (this is actually normal behaviour of "hg pull", but the
consequences are especially noticeable while using shared clones).
>> Does "hg heads ." show you more than one head?
>
> The DAG window shows the normal one head per branch as appropriate for the
> particular branch display. At the moment, hg heads shows the four commits
> from Eli, 82628 to 82631 as heads plus old 2.6 and 3.1 heads.
>
>> Is your clone "clean" (i.e. does "hg status" show anything as 'M')?
>
> The status window is empty until I edit NEWS and click Refresh, at which
> point M Misc/News shows up with the megadiff.
> Right click/ Revert/yes and the file is reverted.
>
>> Once your clone is clean you can just edit Misc/NEWS manually
>
> Since the graft and import failed (producing no diff), I have been editing
> manually and that is when I get the megadiff. I added a couple of blank
> lines to ACKS and got a normal diff. Now, adding a blank line to 2.7 NEWS
> also gives a blank line.
>
> Could the failed graft have messed up the master copy in my cpython
> repository.
>
That's possible. From "hg help graft":
If a graft merge results in conflicts, the graft process is interrupted so
that the current merge can be manually resolved. Once all conflicts are
addressed, the graft process can be continued with the -c/--continue
option.
This doesn't mean that you copy is messed up though. "hg up -C 3.2"
should restore it.
When I graft/merge and there are conflicts I use kdiff3, and it takes
just a few seconds to solve the conflicts usually (for Misc/NEWS is
ctrl+2, ctrl+3, ctrl+s, alt+f4, that roughly translates too "include
both the conflicting news, save and quit).
> I have tried deleting the NEWS file and reverting the deletion.
> hg update does not restore the file as it apparently thinks I actually want
> the uncommitted deletion.
>
How did you delete it? I assume that if you do it from the TortoiseHG
GUI, it will mark it as "deleted" ('D' in "hg status").
If you do it from cmd/file manager hg should see it as missing ('!' in
"hg status") and you can use "hg revert Misc/NEWS" to restore it.
>> it's easier than trying to graft the 2 changesets you made on 2.7 to
>> add and edit the Misc/NEWS entry.
>
> There was only one 2.7 changeset with only the NEWS patch.
>
I was referring to the one that added the news + the one that fixed
the issue id.
>> You can also check with "hg in" and "hg out" if there's something you
>> haven't pulled/pushed yet, but that shouldn't be a problem.
>
> I tried both and got 'no changes'.
>
>> (If you prefer you can come on #python-dev too.)
>
> I may try that, but I suspect that my registration/nick has expired again
> and last time is was obnoxiously hard to get re-established.
>
There's no need to register your nick for #python-dev (there is for
#python though). You can just fire up your favourite IRC client (or
even http://webchat.freenode.net/) and join.
(Registering the nick shouldn't be difficult though.)
> Terry
>
___
Python-Dev mailing list
[email protected]
http://mail.python.org/mailman/listinfo/python-dev
Unsubscribe:
http://mail.python.org/mailman/options/python-dev/archive%40mail-archive.com
Re: [Python-Dev] Python Language Summit at PyCon: Agenda
Hi all, I won't be able to make it to the summit and probably not the conference. I have a raging 104F fever (40C for many of you =) The doctor says I have influenza and am highly contagious, so I shouldn't be going anywhere near conference full of people for five days - looks like I'm missing this one :( I may make it down for a couple of sprint days. -Frank ___ Python-Dev mailing list [email protected] http://mail.python.org/mailman/listinfo/python-dev Unsubscribe: http://mail.python.org/mailman/options/python-dev/archive%40mail-archive.com
