On 07/05/15 22:05, Fabian Neundorf wrote:

Hi this is probably not important for long if we transition to Phabricator, but I want to ask if developers could rebase only if necessary (merge conflicts with master) and if you rebase do it in a separate patchset.

The reason being that when you compare two patchsets to determine the changes to a version you've already reviewed that this is ugly if there was a rebase in between as the changes due to the rebase are included in that.

This means gerrit now show unrelated changes and it's harder to determine which change were introduced due to the rebase and which were intentionally added by the dev to the new patch set.

Thank you in advance ;)

For example the change to generate_user_files between PS25 and PS26 [0] are neither a part of PS25 nor PS26.

Fabian

Hello,

Tim Starling raised such concern just after we migrated to Gerrit and he wrote a small web form that let you diff between patchsets. Basically, it fetch both patches, rebase them on top of a common ancestor and then produce the diff.

The mail: https://lists.wikimedia.org/pipermail/wikitech-l/2012-March/059353.html

Utility: http://tstarling.com/gerrit-differ.php

Source code: http://svn.wikimedia.org/viewvc/mediawiki/trunk/tools/gerrit-differ/gerrit-d...

One can probably craft a one liner using the `git merge-base` command which finds a common ancestor between two commit. From there rebase each patches on top of it and do the diff.