Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Doc changes left over after mega-merge from trunk #45711

Closed
gvanrossum opened this issue Nov 1, 2007 · 8 comments
Closed

Doc changes left over after mega-merge from trunk #45711

gvanrossum opened this issue Nov 1, 2007 · 8 comments
Assignees
@birkenfeld
Labels
docs Documentation in the Doc dir

Comments

@gvanrossum
Copy link
Member

BPO 1370
Nosy @gvanrossum, @birkenfeld, @amauryfa
Files
  • Doc.diff
    		•

    Note: these values reflect the state of the issue at the time it was migrated and might not reflect the current state.

    Show more details

    GitHub fields:

    assignee = 'https://github.com/birkenfeld'
closed_at = <Date 2007-11-01.20:33:07.057>
created_at = <Date 2007-11-01.19:48:11.850>
labels = ['docs']
title = 'Doc changes left over after mega-merge from trunk'
updated_at = <Date 2009-07-15.09:21:01.711>
user = 'https://github.com/gvanrossum'

    bugs.python.org fields:

    activity = <Date 2009-07-15.09:21:01.711>
actor = 'amaury.forgeotdarc'
assignee = 'georg.brandl'
closed = True
closed_date = <Date 2007-11-01.20:33:07.057>
closer = 'georg.brandl'
components = ['Documentation']
creation = <Date 2007-11-01.19:48:11.850>
creator = 'gvanrossum'
dependencies = []
files = ['8673']
hgrepos = []
issue_num = 1370
keywords = []
message_count = 8.0
messages = ['57029', '57032', '57034', '57035', '57036', '57037', '90533', '90534']
nosy_count = 4.0
nosy_names = ['gvanrossum', 'georg.brandl', 'pedronis', 'amaury.forgeotdarc']
pr_nums = []
priority = 'critical'
resolution = 'fixed'
stage = None
status = 'closed'
superseder = None
type = None
url = 'https://bugs.python.org/issue1370'
versions = ['Python 3.0']
    @gvanrossum
    Copy link
    Member Author

    When merging the trunk into py3k, a large number of Doc changes
    appeared, many of which were conflicts. I checked in the non-Doc
    changes, and hope that someone else (Georg?) will do the honors of
    sorting through the doc changes. Here are the diffs of what I left
    unsubmitted, with conflict markers intact. These files have conflicts:

    C Doc/c-api/newtypes.rst
    C Doc/c-api/abstract.rst
    C Doc/reference/compound_stmts.rst
    C Doc/reference/expressions.rst
    C Doc/tutorial/controlflow.rst
    C Doc/tutorial/classes.rst
    C Doc/library/inspect.rst
    C Doc/library/difflib.rst
    C Doc/library/sqlite3.rst
    C Doc/library/xmlrpclib.rst
    C Doc/library/dis.rst
    C Doc/library/stdtypes.rst
    C Doc/library/collections.rst
    C Doc/library/functions.rst
    C Doc/library/exceptions.rst
    C Doc/glossary.rst

    @gvanrossum gvanrossum added the docs Documentation in the Doc dir label Nov 1, 2007
    @birkenfeld
    Copy link
    Member

    I saw the merge commit and that it missed Doc/, and I feared this. :D

    But, having caused most of this mess, I'll sort it out right now.

    @birkenfeld
    Copy link
    Member

    Okay, resolved and committed in r58752.

    @gvanrossum
    Copy link
    Member Author

    Hm, what happened to Doc/using? Should that perhaps also be submitted?

    @birkenfeld
    Copy link
    Member

    I noted that too, should be in the repos now.

    @gvanrossum
    Copy link
    Member Author

    On 11/1/07, Georg Brandl <report@bugs.python.org> wrote:

    Georg Brandl added the comment:

    I noted that too, should be in the repos now.

    Thanks! And thanks for fixing up my mess so quickly!!

    @pedronis
    Copy link
    Mannequin

    pedronis mannequin commented Jul 15, 2009

    on a moving gc the identity hash is not unique, id() needs to be unique.
    So not using it is a matter of correctness not speed.

    But this issue is too terse to be sure what is talking about.

    @pedronis pedronis mannequin changed the title Doc changes left over after mega-merge from trunk Use System.identityHashCode for id() Jul 15, 2009
    @amauryfa
    Copy link
    Member

    You probably wanted to send this message to the jython tracker :-)

    @amauryfa amauryfa changed the title Use System.identityHashCode for id() Doc changes left over after mega-merge from trunk Jul 15, 2009
    @ezio-melotti ezio-melotti transferred this issue from another repository Apr 10, 2022
    Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
    Assignees

    @birkenfeld birkenfeld

    Labels
    docs Documentation in the Doc dir
    Projects
    None yet
    Milestone
    No milestone
    Development

    No branches or pull requests
    3 participants
    @birkenfeld @amauryfa @gvanrossum