Fixes for stale states, case insensitive moves

[pithos-ms-client] / trunk / Pithos.Client.WPF / FileProperties / ConflictResolver.cs

diff --git a/trunk/Pithos.Client.WPF/FileProperties/ConflictResolver.cs b/trunk/Pithos.Client.WPF/FileProperties/ConflictResolver.cs
index fe1095f..1c66f24 100644 (file)
--- a/trunk/Pithos.Client.WPF/FileProperties/ConflictResolver.cs
+++ b/trunk/Pithos.Client.WPF/FileProperties/ConflictResolver.cs
@@ -76,7 +76,7 @@ namespace Pithos.Client.WPF.FileProperties
                           select new CloudDownloadAction(account, info, "Resolver");
 
             downloadActions.Apply(action=> StatusAgent.SetFileState(action.FileState.FilePath,FileStatus.Unchanged,FileOverlayStatus.Normal,"Resolve by downloading"));
-            downloadActions.Apply(NetworkAgent.Post);            
+            //downloadActions.Apply(NetworkAgent.Post);            
 
         }
 
@@ -94,10 +94,10 @@ namespace Pithos.Client.WPF.FileProperties
                           let account = accounts.First(acc => conflict.FilePath.StartsWith(acc.AccountPath, StringComparison.InvariantCultureIgnoreCase))
                           let info = FileInfoExtensions.FromPath(conflict.FilePath)
                           select new CloudUploadAction(account, info, conflict.State, 
-                              account.BlockSize, account.BlockHash,"Resolver");
+                              account.BlockSize, account.BlockHash,"Resolver",false);
 
             actions.Apply(action => StatusAgent.SetFileState(action.FileState.FilePath, FileStatus.Modified, FileOverlayStatus.Normal, "Resolve by downloading"));
-            actions.Apply(NetworkAgent.Post);
+            //actions.Apply(NetworkAgent.Post);
         }
 
         //Keeping both versions means that we need to copy one of them