[Python-Dev] [Python-checkins] cpython (merge 2.7 -> 2.7): Clean merge
Ezio Melotti
ezio.melotti at gmail.com
Mon Aug 12 23:42:25 CEST 2013
Hi,
On Mon, Aug 12, 2013 at 10:51 PM, david.wolever
<python-checkins at python.org> wrote:
> http://hg.python.org/cpython/rev/0f4d971b0cee
> changeset: 85138:0f4d971b0cee
> branch: 2.7
> parent: 85137:102b3e257dca
> parent: 83899:ef037ad304c1
> user: David Wolever <david at wolever.net>
> date: Thu May 23 17:51:58 2013 -0400
> summary:
> Clean merge
>
> files:
> .hgtags | 1 +
> Doc/c-api/exceptions.rst | 38 +-
> Doc/c-api/intro.rst | 4 +-
> Doc/faq/design.rst | 4 +-
> Doc/faq/programming.rst | 86 +
> Doc/glossary.rst | 8 +
> Doc/howto/advocacy.rst | 355 -------
> Doc/howto/index.rst | 1 -
> Doc/howto/sockets.rst | 8 +-
> Doc/howto/urllib2.rst | 12 +-
> Doc/library/codecs.rst | 172 ++-
> Doc/library/collections.rst | 4 +-
> Doc/library/compileall.rst | 2 +-
> Doc/library/ctypes.rst | 2 +-
> Doc/library/io.rst | 3 +
> Doc/library/itertools.rst | 4 +-
> Doc/library/numbers.rst | 8 +-
> Doc/library/operator.rst | 47 +-
> Doc/library/resource.rst | 21 +-
> Doc/library/socket.rst | 16 +-
> Doc/library/ssl.rst | 16 +-
> Doc/library/stdtypes.rst | 28 +-
> Doc/library/string.rst | 5 +-
> Doc/library/unittest.rst | 2 +
> Doc/library/urllib.rst | 7 +
> Doc/library/urllib2.rst | 15 +-
> Doc/reference/datamodel.rst | 9 +-
> Doc/reference/expressions.rst | 15 +-
> Doc/reference/simple_stmts.rst | 3 +
> Doc/tutorial/inputoutput.rst | 23 +-
> Doc/tutorial/modules.rst | 7 +-
> Doc/using/mac.rst | 14 +-
> Include/object.h | 16 +-
> Include/patchlevel.h | 4 +-
> Lib/_weakrefset.py | 6 +
> Lib/collections.py | 2 -
> Lib/ctypes/test/__init__.py | 2 +-
> Lib/ctypes/test/test_wintypes.py | 43 +
> Lib/ctypes/util.py | 2 +-
> Lib/distutils/__init__.py | 2 +-
> Lib/filecmp.py | 2 +-
> Lib/gzip.py | 69 +-
> Lib/idlelib/Bindings.py | 4 +
> Lib/idlelib/EditorWindow.py | 31 +-
> Lib/idlelib/PyShell.py | 1 -
> Lib/idlelib/help.txt | 3 +-
> Lib/idlelib/idlever.py | 2 +-
> Lib/idlelib/run.py | 5 +
> Lib/logging/handlers.py | 36 +-
> Lib/mimetypes.py | 2 +
> Lib/multiprocessing/pool.py | 2 +
> Lib/multiprocessing/synchronize.py | 2 +-
> Lib/multiprocessing/util.py | 5 +-
> Lib/pickle.py | 2 +-
> Lib/plistlib.py | 4 +-
> Lib/pydoc_data/topics.py | 18 +-
> Lib/sre_parse.py | 6 +-
> Lib/ssl.py | 26 +-
> Lib/tarfile.py | 12 +-
> Lib/test/pickletester.py | 2 +
> Lib/test/test_base64.py | 26 +
> Lib/test/test_bz2.py | 31 +-
> Lib/test/test_collections.py | 2 +-
> Lib/test/test_dictviews.py | 5 +
> Lib/test/test_gdb.py | 46 +-
> Lib/test/test_gzip.py | 17 -
> Lib/test/test_io.py | 4 +-
> Lib/test/test_mimetypes.py | 2 +
> Lib/test/test_multiprocessing.py | 32 +-
> Lib/test/test_plistlib.py | 12 +
> Lib/test/test_pydoc.py | 57 +-
> Lib/test/test_re.py | 11 +
> Lib/test/test_sax.py | 20 +
> Lib/test/test_support.py | 9 +
> Lib/test/test_tarfile.py | 8 +
> Lib/test/test_tcl.py | 18 +-
> Lib/test/test_weakset.py | 6 +
> Lib/test/test_winreg.py | 12 +-
> Lib/test/test_zipfile.py | 10 +-
> Lib/test/testbz2_bigmem.bz2 | Bin
> Lib/threading.py | 42 +-
> Lib/xml/sax/saxutils.py | 8 +-
> Misc/ACKS | 9 +
> Misc/NEWS | 457 ++++++---
> Misc/RPM/python-2.7.spec | 2 +-
> Modules/_ctypes/libffi/src/dlmalloc.c | 5 +
> Modules/_multiprocessing/multiprocessing.c | 2 +-
> Modules/_sqlite/cursor.c | 2 +-
> Modules/_sqlite/util.c | 8 +-
> Modules/_sqlite/util.h | 4 +-
> Modules/_testcapimodule.c | 2 +-
> Modules/cPickle.c | 10 +-
> Modules/dbmmodule.c | 8 +-
> Modules/operator.c | 14 +-
> Modules/readline.c | 27 +-
> Modules/selectmodule.c | 35 +-
> Modules/signalmodule.c | 14 +-
> Modules/sre.h | 4 +-
> Objects/dictobject.c | 4 +
> PCbuild/rt.bat | 4 +-
> README | 2 +-
> Tools/scripts/gprof2html.py | 2 +-
> configure | 2 +-
> configure.ac | 2 +-
> setup.py | 8 +-
> 105 files changed, 1301 insertions(+), 955 deletions(-)
>
>
To avoid these big merges you can do:
# check the two heads that you are going to merge and their csids
hg heads .
# update to the other head (the one you pulled, not the one you committed)
hg up csid-of-the-other-head
# merge your changes on with the ones you pulled
hg merge
This will merge the changes you just committed with the ones you
pulled, and result in a shorter diff that is easier to
read/review/merge.
Otherwise pulling and updating before committing will avoid the
problem entirely (unless you end up in a push-race).
Best Regards,
Ezio Melotti
More information about the Python-Dev
mailing list