[Insight-developers] gerrit and reverting one commit

[Williams, Norman K]

Gerrit cares about the Change-ID  as much as anything.

Anything you do locally to your repository is your business.

Before you push the patch to Gerrit, you want to be sure that the Change
ID in the commit message matches the topic Change-ID.  You probably also
want to squash the commits to your local git repo to a single commit with
that Change-ID.

Local reverts and commits aren't going to be represented in the Gerrit
topic; each topic represents the changes between the master revision it's
based on and your changes.

If you really get a patch scrambled up and aren't sure what to do, you can
use git diff to collect the changes as a patch script, trash the current
branch in my local git, create it again, and then apply the patch.

It also is possible to abandon a patch on the ITK Gerrit and start over.

It's more important that your patch is comprehensible and does what it is
supposed to do, than how you end up with the patch you push to Gerrit ;-)

On 3/30/11 1:44 PM, "Arnaud GELAS" <arnaud_gelas at hms.harvard.edu> wrote:


>Hi all,
>
>Can reverting one commit be part of a gerrit patch?
>
>Or can I do:
>
>     git revert ccccccc
>     edit files...
>
>commit and then push to gerrit.
>
>I don't see any problem in this (?), but would it show up in a single
>patch or linked?
>Is it the right way to go?
>
>Thanks,
>Arnaud
>
>_______________________________________________
>Powered by www.kitware.com
>
>Visit other Kitware open-source projects at
>http://www.kitware.com/opensource/opensource.html
>
>Kitware offers ITK Training Courses, for more information visit:
>http://kitware.com/products/protraining.html
>
>Please keep messages on-topic and check the ITK FAQ at:
>http://www.itk.org/Wiki/ITK_FAQ
>
>Follow this link to subscribe/unsubscribe:
>http://www.itk.org/mailman/listinfo/insight-developers



________________________________
Notice: This UI Health Care e-mail (including attachments) is covered by the Electronic Communications Privacy Act, 18 U.S.C. 2510-2521, is confidential and may be legally privileged.  If you are not the intended recipient, you are hereby notified that any retention, dissemination, distribution, or copying of this communication is strictly prohibited.  Please reply to the sender that you have received the message in error, then delete it.  Thank you.
________________________________