[Python-checkins] cpython (merge 3.2 -> default): #12183: merge with 3.2.
ezio.melotti
python-checkins at python.org
Tue Aug 2 16:42:39 CEST 2011
http://hg.python.org/cpython/rev/746dc0a2398e
changeset: 71693:746dc0a2398e
parent: 71692:dc96af0e7f60
parent: 71691:299992730c87
user: Ezio Melotti <ezio.melotti at gmail.com>
date: Tue Aug 02 17:42:24 2011 +0300
summary:
#12183: merge with 3.2.
files:
Doc/library/shutil.rst | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/Doc/library/shutil.rst b/Doc/library/shutil.rst
--- a/Doc/library/shutil.rst
+++ b/Doc/library/shutil.rst
@@ -101,8 +101,9 @@
:func:`copy2`.
If *symlinks* is true, symbolic links in the source tree are represented as
- symbolic links in the new tree; if false or omitted, the contents of the
- linked files are copied to the new tree.
+ symbolic links in the new tree, but the metadata of the original links is NOT
+ copied; if false or omitted, the contents and metadata of the linked files
+ are copied to the new tree.
When *symlinks* is false, if the file pointed by the symlink doesn't
exist, a exception will be added in the list of errors raised in
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list