projects
/
nextcloud-desktop.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
6b16e18
)
Propagator: Mention name of conflict file (for debugging)
author
Markus Goetz
<markus@woboq.com>
Tue, 12 May 2015 15:10:53 +0000
(17:10 +0200)
committer
Markus Goetz
<markus@woboq.com>
Tue, 12 May 2015 15:11:21 +0000
(17:11 +0200)
src/libsync/propagatedownload.cpp
patch
|
blob
|
history
diff --git
a/src/libsync/propagatedownload.cpp
b/src/libsync/propagatedownload.cpp
index a0337488bc8177cbb2ee51b271f15d6931975461..65fc409a741e50a1d5635a356942fd9697a47e6b 100644
(file)
--- a/
src/libsync/propagatedownload.cpp
+++ b/
src/libsync/propagatedownload.cpp
@@
-532,6
+532,7
@@
void PropagateDownloadFileQNAM::downloadFinished()
done(SyncFileItem::SoftError, renameError);
return;
}
+ qDebug() << "Created conflict file" << fn << "->" << conflictFileName;
}
FileSystem::setModTime(_tmpFile.fileName(), _item._modtime);