comparison: dav/sync.c
dav/sync.c
- changeset 685
- 487645580b5e
- parent 681
- 3320429502cf
- child 686
- ab159748055c
equal
deleted
inserted
replaced
| 684:a4b4257c1a5f | 685:487645580b5e |
|---|---|
| 1038 type = REMOTE_CHANGE_MODIFIED; | 1038 type = REMOTE_CHANGE_MODIFIED; |
| 1039 } | 1039 } |
| 1040 ret = type; | 1040 ret = type; |
| 1041 } | 1041 } |
| 1042 } else if(link) { | 1042 } else if(link) { |
| 1043 if(type == REMOTE_CHANGE_CONFLICT_LOCAL_MODIFIED) { | 1043 if(exists && type == REMOTE_CHANGE_CONFLICT_LOCAL_MODIFIED) { |
| 1044 ret = REMOTE_CHANGE_CONFLICT_LOCAL_MODIFIED; | 1044 ret = REMOTE_CHANGE_CONFLICT_LOCAL_MODIFIED; |
| 1045 } else { | 1045 } else { |
| 1046 ret = REMOTE_CHANGE_LINK; | 1046 ret = REMOTE_CHANGE_LINK; |
| 1047 } | 1047 } |
| 1048 } else if(exists) { | 1048 } else if(exists) { |
