I have a trivial little documentation patch for csv.rst. I committed it
locally, then I pulled and merged:
cpython% hg pull
pulling from ssh://h...@hg.python.org/cpython
searching for changes
adding changesets
adding manifests
adding file changes
added 94 changesets with 422 changes to 154 files (+1 heads)
(run 'hg heads' to see heads, 'hg merge' to merge)
cpython% hg merge
132 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
hg heads showed my changeset:
changeset: 68585:c63d7374b89a
user: Skip Montanaro <s...@pobox.com>
date: Sat Mar 19 09:09:30 2011 -0500
summary: Mention RFC 4180. Based on input by Tony Wallace in issue
11456.
I committed. Now:
changeset: 68680:64eeb4cd4b56
tag: tip
parent: 68585:c63d7374b89a
parent: 68679:dfceb98767c0
user: Skip Montanaro <s...@pobox.com>
date: Sat Mar 19 09:15:28 2011 -0500
summary: commit merge
The dev guide says something about collapsing changesets. Is that
collapsing commits within a changeset or collapsing multiple changesets
(whatever that might be)? Do I need this for a trivial change? Can I just
push at this point? Once pushed, how does it get merged into the main
codebase?
Skip
_______________________________________________
Python-Dev mailing list
Python-Dev@python.org
http://mail.python.org/mailman/listinfo/python-dev
Unsubscribe:
http://mail.python.org/mailman/options/python-dev/archive%40mail-archive.com
