From 535cc481e6218794fac29d8b3f012a1612baa9fc Mon Sep 17 00:00:00 2001
From: "Tim J. Robbins" <tjr@FreeBSD.org>
Date: Sat, 1 Oct 2005 05:54:39 +0000
Subject: [PATCH] Merge from old copypass.c rev 1.3: If we must yell at the
 user than a file cannot be linked into place when requested (not required) to
 do it, reassure them that cpio is still intelligent enough that it will
 perform a full copy instead.

---
 contrib/cpio/src/copypass.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/cpio/src/copypass.c b/contrib/cpio/src/copypass.c
index 0827f9c9840..6cef1e8abd5 100644
--- a/contrib/cpio/src/copypass.c
+++ b/contrib/cpio/src/copypass.c
@@ -469,7 +469,7 @@ link_to_name (char *link_name, char *link_target)
     }
   else if (link_flag)
     {
-      error (0, errno, _("cannot link %s to %s"),
+      error (0, errno, _("cannot link %s to %s (will copy instead)"),
 	     link_target, link_name);
     }
   return res;