[vtk-developers] Gerrit topis with many changes

[Moreland, Kenneth]

Philippe,

Although I agree that gerrit should better handle multiple commits (and we've already had a lengthy email thread on it and I believe there is an action item to improve it), I think a better approach for now is to continue to capture commits in whatever method fits your development style best and then use something like an interactive rebase to squash the commits when you are ready for review.  You could do that for this very gerrit topic.

-Ken

From: Philippe Pébay <philippe.pebay at kitware.com<mailto:philippe.pebay at kitware.com>>
Date: Monday, December 3, 2012 12:13 AM
To: Bill Lorensen <bill.lorensen at gmail.com<mailto:bill.lorensen at gmail.com>>
Cc: VTK Developers <vtk-developers at vtk.org<mailto:vtk-developers at vtk.org>>
Subject: [EXTERNAL] Re: [vtk-developers] Gerrit topis with many changes

Hello Bill

Thanks for your message. It is true that there are a lot of incremental changes but this development is a substantial new feature being added and a lot of the things done in the process are experimental. I need to have many checkpoints.
I think that the development workflow should not overly constrain the developer, otherwise it defeats its very purpose. That said I will remember your advice about the --amend flag and will try to use it as often as possible.

Thank you
Philippe

On Sun, Dec 2, 2012 at 9:42 PM, Bill Lorensen <bill.lorensen at gmail.com<mailto:bill.lorensen at gmail.com>> wrote:
Phillipe,

It is very difficult to review gerrit topic like
http://review.source.kitware.com/#/t/1805/ which have so many changes.
I try to keep my topics limited to one or two changes.
 For example, one change might correct a bug and another might add or
change a test.

I see that many of your changes are corrections to other changes.

If you do a
git add -- filenames
then a
git commit --amend

the corrections will be part of the last commit.

If you cut/past the change-id in a commit that you are making a
correction or minor addition to git will keep them part of the
original change.

To be honest, I don;t do not see how anyone can review a topic like this.

Bill



--
Philippe Pébay, PhD
Director of Visualization and High Performance Computing /
Directeur de la Visualisation et du Calcul Haute Performance
Kitware SAS
26 rue Louis Guérin, 69100 Villeurbanne, France
+33 (0) 6.83.61.55.70 / 4.37.45.04.15
http://www.kitware.fr<http://www.kitware.fr/><http://www.kitware.fr/>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://www.vtk.org/pipermail/vtk-developers/attachments/20121203/5ff014dd/attachment.htm>