diff hgext/largefiles/overrides.py @ 23602:a4679a74df14

merge with stable

--- a/hgext/largefiles/overrides.py	Wed Dec 17 15:11:26 2014 -0800
+++ b/hgext/largefiles/overrides.py	Thu Dec 18 16:41:59 2014 -0600
@@ -191,8 +191,15 @@
                 # are removing the file.
                 if isaddremove:
                     ui.status(_('removing %s\n') % f)
-                util.unlinkpath(repo.wjoin(f), ignoremissing=True)
-            lfdirstate.remove(f)
+
+            if not opts.get('dry_run'):
+                if not after:
+                    util.unlinkpath(repo.wjoin(f), ignoremissing=True)
+                lfdirstate.remove(f)
+
+        if opts.get('dry_run'):
+            return result
+
         lfdirstate.write()
         remove = [lfutil.standin(f) for f in remove]
         # If this is being called by addremove, let the original addremove