Can't we just keep the version, but change/overwrite the comment text to "Restored from recycle bin”?

On Fri, Feb 5, 2016 at 3:17 PM, vincent(a)massol.net wrote: > > > > On 5 Feb 2016 at 14:06:23, vincent(a)massol.net (vincent(a)massol.net(mailto: > vincent(a)massol.net)) wrote: > > > Hi devs, > > > > I’ve just realized (thanks to a failing functional test) that we’ve > changed the behavior we had when we restore a deleted document. > > > > We used to add a revision with a comment text of "Restored from recycle > bin”. > > > > After https://jira.xwiki.org/browse/XWIKI-9960, there’s no new revision > created when restoring a deleted document. > > > > We need to decide if that’s what we want. > > > > Apart from the fact that it’s a minor backward-compatibility breakage > (for tools/scripts expecting that revision), the only downside I can see is > that by looking at a document history you won’t be able to get the full > list of what happened to this doc, i.e. that such user has restored the > document. > > > > WDYT? > > Thomas just told me that in practice this behavior was there prior to > XWIKI-9960 (possibly done a long time ago) and that XWIKI-9960 has just > fixed the issue for documents *with* attachments, so that all documents now > work the same. > > It’s possible that this change was done involuntarily as a side effect of > other issues we fixed (when playing with doc meta data dirty and content > dirty flags). > > So while this is not a regression for 7.4.1/8.0M1, it would still be > interesting to confirm here if that’s the behavior we want. > > WDYT? > > Thanks > -Vincent > > > > Personally I think this could be acceptable but I’m not sure. > > > > Thanks > > -Vincent

On Tue, Mar 1, 2016 at 6:09 PM, Marius Dumitru Florea wrote: > On Fri, Feb 5, 2016 at 3:06 PM, vincent(a)massol.net > wrote: > >> Hi devs, >> >> I’ve just realized (thanks to a failing functional test) that we’ve >> changed the behavior we had when we restore a deleted document. >> >> We used to add a revision with a comment text of "Restored from recycle >> bin”. >> >> After https://jira.xwiki.org/browse/XWIKI-9960, there’s no new revision >> created when restoring a deleted document. >> >> We need to decide if that’s what we want. >> >> Apart from the fact that it’s a minor backward-compatibility breakage (for >> tools/scripts expecting that revision), the only downside I can see is that >> by looking at a document history you won’t be able to get the full list of >> what happened to this doc, i.e. that such user has restored the document. >> >> WDYT? >> > > "Alice has deleted this page" and "Bob has restored this page from recycle > bin" are *activity stream* events more than history entries (versions).

Indeed, like the distinction Jira makes between history and activity.

>> Personally I think this could be acceptable but I’m not sure. >> >> Thanks >> -Vincent