Skip to main content

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [List Home]
[cdt-dev] Gerrit question about diff and rebase

Hi,

Maybe people more versed in Gerrit can guide me.

When doing a review in Gerrit, I can choose against
what previous patch set the diff should be made.
So, if I push patch 1, it gets reviewed, and
then I update to patch 2, I can ask Gerrit
to show the diff between patch 2 and patch 1.  
Really nice and efficient!  It's like the never
working "compare two patches" feature of bugzilla.

The problem is that if I rebase before pushing patch 2,
the Gerrit diff with patch 1 will show all rebsed files,
although they are not part of my patch.  I see dozens
of useless files :(

This seems to be known Gerrit limitation:
https://groups.google.com/group/repo-discuss/browse_thread/thread/b419ba3453161392/31a3c5c5dad06fb1?lnk=gst&q=rebase+diff#31a3c5c5dad06fb1

Does someone have a suggestion on how to handle this?
1- don't rebase until the end (not so great)
2- only ask gerrit to diff against Base (disappointing)
3- fix it in Gerrit :)
or...

Thanks

Marc


Back to the top