0

My team using Gerrit for reviewing of changes and sometimes we have to push .patch for some files. Sometimes these .patches could reach over ~1000 lines (which obviously not good for reviewing). It is very inconvenient to review it as diff between patches itself. It would be better(in some cases) to review it as diff of origin file and origin file with applied patch(not diff between .patches). Even if original file isn't under version control, committer could attach it with patch set, right?

Unfortunately, after lasting googling i didn't find anything... Is there any way to show diff between two patch files (not patch sets) in such approach or similar?

Jurasic
  • 1,845
  • 1
  • 23
  • 29

1 Answers1

1

I think the best you can do is to find a three-way merge tool to compare

  • the original source;
  • the source with the old patch; and
  • the source with the new patch.

To use such a tool, I think you'd need to use the command lines the Gerrit interface provides to fetch the changes locally, then apply the patches, then use the merge tool for the review.

I don't think you'll find a way to get a "three-way merge" view of the code in the Gerrit UI itself.

Community
  • 1
  • 1
Martin Ellis
  • 9,603
  • 42
  • 53