diff options
| author | Christian Kamm <mail@ckamm.de> | 2016-01-06 12:01:22 +0300 |
|---|---|---|
| committer | Christian Kamm <mail@ckamm.de> | 2016-01-08 07:38:08 +0300 |
| commit | abf5a5ad1e4eadbeb24a999aeeab39ed4357eef9 (patch) | |
| tree | 37a6628179e90130949f2b2b68621f7133726bd8 /src/gui/syncrunfilelog.cpp | |
| parent | d4b6b5cb1dfbdc15d88ace03bad5dfe1f31f9012 (diff) | |
Propagation: Fix dir <-> file changes propagating to server #4302
* Ensure every time a file becomes a directory or the other way around
the item is flagged as INSTRUCTION_TYPE_CHANGE.
* Delete the badly-typed entity if necessary in the propagation jobs.
Diffstat (limited to 'src/gui/syncrunfilelog.cpp')
| -rw-r--r-- | src/gui/syncrunfilelog.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/gui/syncrunfilelog.cpp b/src/gui/syncrunfilelog.cpp index 607ca5662..988d15dea 100644 --- a/src/gui/syncrunfilelog.cpp +++ b/src/gui/syncrunfilelog.cpp @@ -78,6 +78,9 @@ QString SyncRunFileLog::instructionToStr( csync_instructions_e inst ) case CSYNC_INSTRUCTION_ERROR: re = "INST_ERROR"; break; + case CSYNC_INSTRUCTION_TYPE_CHANGE: + re = "INST_TYPE_CHANGE"; + break; } return re; |