# HG changeset patch
# User Martin Geisler <mg@lazybytes.net>
# Date 1268873993 -3600
# Node ID bedef1c228d3ad9aa43bbb40a953cab5f154af07
# Parent  cb0a7faa29eaa26b6cbed5919489c42a15b19f5a# Parent  00d46934ee3591103c39906e6ad648f80dfd1d04
Merge with stable

diff -r cb0a7faa29ea -r bedef1c228d3 mercurial/localrepo.py
--- a/mercurial/localrepo.py	Wed Mar 17 18:15:16 2010 -0500
+++ b/mercurial/localrepo.py	Thu Mar 18 01:59:53 2010 +0100
@@ -1091,10 +1091,11 @@
                     rejected.append(f)
                     continue
                 if st.st_size > 10000000:
-                    self.ui.warn(_("%s: files over 10MB may cause memory and"
-                                   " performance problems\n"
-                                   "(use 'hg revert %s' to unadd the file)\n")
-                                   % (f, f))
+                    self.ui.warn(_("%s: up to %d MB of RAM may be required "
+                                   "to manage this file\n"
+                                   "(use 'hg revert %s' to cancel the "
+                                   "pending addition)\n")
+                                   % (f, 3 * st.st_size // 1000000, f))
                 if not (stat.S_ISREG(st.st_mode) or stat.S_ISLNK(st.st_mode)):
                     self.ui.warn(_("%s not added: only files and symlinks "
                                    "supported currently\n") % f)