From 7f6479f79065e63f28055ab0c1b0882112f13c98 Mon Sep 17 00:00:00 2001 From: "Zeyi (Rice) Fan" Date: Tue, 15 Sep 2020 09:34:46 -0700 Subject: [PATCH] fix eden redirect fixup properly now Summary: ghostbooleans Apparently I didn't test for the positive case in my previous diff that introduces this check :( Reviewed By: xavierd Differential Revision: D23698179 fbshipit-source-id: 95a28cc13bff5e325214b6a398e19c821b5ae17f --- eden/fs/cli/redirect.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/eden/fs/cli/redirect.py b/eden/fs/cli/redirect.py index cb92e49504..a685064c2f 100644 --- a/eden/fs/cli/redirect.py +++ b/eden/fs/cli/redirect.py @@ -407,9 +407,8 @@ class Redirection: def apply(self, checkout: EdenCheckout): disposition = self.remove_existing(checkout) - if ( - disposition == RepoPathDisposition.IS_NON_EMPTY_DIR - and self.type == RedirectionType.SYMLINK + if disposition == RepoPathDisposition.IS_NON_EMPTY_DIR and ( + self.type == RedirectionType.SYMLINK or (self.type == RedirectionType.BIND and sys.platform == "win32") ): # Part of me would like to show this error even if we're going