Site.upload may trigger EditConflict when using Page.save if page is loaded before the upload.
EditConflict is raised in site.py line 2796-2798:
if lastrev is not None and page.latestRevision() != lastrev: raise EditConflict( "editpage: Edit conflict detected; saving aborted.")
Version: core-(2.0)
Severity: normal