summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--src/copy.c7
2 files changed, 10 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 9d7970d6b..2f461cf95 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2006-08-27 Jim Meyering <jim@meyering.net>
+
+ * src/copy.c (copy_internal): Add comments.
+
2006-08-26 Paul Eggert <eggert@cs.ucla.edu>
* src/Makefile.am (AM_CPPFLAGS): Remove -I$(srcdir) and -I../lib,
diff --git a/src/copy.c b/src/copy.c
index 9ca2ae9df..70886b338 100644
--- a/src/copy.c
+++ b/src/copy.c
@@ -1033,7 +1033,8 @@ copy_internal (char const *src_name, char const *dst_name,
}
}
else
- {
+ { /* Here, we know that dst_name exists, at least to the point
+ that it is XSTAT'able. */
bool return_now;
bool unlink_src;
bool ok = same_file_ok (src_name, &src_sb, dst_name, &dst_sb,
@@ -1067,6 +1068,8 @@ copy_internal (char const *src_name, char const *dst_name,
{
if (x->move_mode && x->backup_type != no_backups)
{
+ /* Moving/copying a directory onto an existing
+ non-directory is ok only with --backup. */
}
else
{
@@ -1101,6 +1104,8 @@ copy_internal (char const *src_name, char const *dst_name,
{
if (x->move_mode && x->backup_type != no_backups)
{
+ /* Moving/copying a non-directory onto an existing
+ directory is ok only with --backup. */
}
else
{