[Python-checkins] r73894 - python/branches/py3k/Lib/test/test_zipfile.py

[Alexandre Vassalotti]

On Wed, Jul 8, 2009 at 6:24 PM, ezio.melotti<python-checkins at python.org> wrote:
> Author: ezio.melotti
> Date: Thu Jul  9 00:24:06 2009
> New Revision: 73894
>
> Log:
> Merged revisions 73841 via svnmerge from
> svn+ssh://pythondev@svn.python.org/python/trunk
>
> ........
>  r73841 | ezio.melotti | 2009-07-04 17:58:27 +0300 (Sat, 04 Jul 2009) | 1 line
>
>  if zlib -> skipUnless(zlib) and minor cleanups
> ........
>
>
> Modified:
>   python/branches/py3k/Lib/test/test_zipfile.py
>

Ezio,

When you merge your changes with svnmerge.py, you need to also commit
the svn metadata. So when you commit, do not specify only the file you
are merging. For example, this is:

Bad:

   svn commit -F svnmerge-commit-message.txt Lib/test/test_zipfile.py

Good:

   svn commit -F svnmerge-commit-message.txt . Lib/test/test_zipfile.py

Also good:

   svn commit -F svnmerge-commit-message.txt


If you do otherwise your merge won't be recorded.

Thank you,
-- Alexandre