Revision 268bec7f trunk/Pithos.Core/Agents/NetworkAgent.cs
| b/trunk/Pithos.Core/Agents/NetworkAgent.cs | ||
|---|---|---|
| 331 | 331 |
var downloadPath = action.LocalFile.GetProperCapitalization(); |
| 332 | 332 |
|
| 333 | 333 |
var cloudHash = cloudFile.Hash.ToLower(); |
| 334 |
var previousCloudHash = cloudFile.PreviousHash.ToLower(); |
|
| 334 |
var previousCloudHash = cloudFile.PreviousHash == null?null: cloudFile.PreviousHash.ToLower();
|
|
| 335 | 335 |
var localHash = action.TreeHash.Value.TopHash.ToHashString();// LocalHash.Value.ToLower(); |
| 336 | 336 |
//var topHash = action.TopHash.Value.ToLower(); |
| 337 | 337 |
|
| 338 |
if(cloudFile.IsDirectory && action.LocalFile is DirectoryInfo) |
|
| 339 |
{
|
|
| 340 |
Log.InfoFormat("Skipping folder {0} , exists in server", downloadPath);
|
|
| 341 |
return; |
|
| 342 |
} |
|
| 343 |
|
|
| 338 | 344 |
//At this point we know that an object has changed on the server and that a local |
| 339 | 345 |
//file already exists. We need to decide whether the file has only changed on |
| 340 | 346 |
//the server or there is a conflicting change on the client. |
Also available in: Unified diff