[Insight-developers] Gerrit topic based on 'bad' master -- fix or abandon and re-do?

[Bill Lorensen]

Here is how I handle these situations:

0) Update your master:
  git checkout master
  git pullall

1) On your machine, checkout your topic:
  git checkout
AddHD5TransformIO<http://review.source.kitware.com/#q,status:abandoned+project:ITK+branch:master+topic:AddHD5TransformIO,n,z>

2) Try a rebase:
  git rebase master
AddHD5TransformIO<http://review.source.kitware.com/#q,status:abandoned+project:ITK+branch:master+topic:AddHD5TransformIO,n,z>

If all goes well,
3) git gerrit-push

Otherwise, try to resolve the conflicts

If resolved, do your commit, rebase it to squash and gerrit-push

otherwise,
git rebase --abort

If you could not merge, they make your changes in another topic.


On Thu, Mar 24, 2011 at 10:53 AM, Williams, Norman K <
norman-k-williams at uiowa.edu> wrote:

> I ran into this morning -- I have a gerrit topic
>
> http://review.source.kitware.com/#change,1246
>
> that seems to be based on the master before Brad King fixed a problem with
> GDCM.
>
> Should I redo the patch on the current master and abandon the old one, or
> is it possible to rebase the existing patch?
>
> --
> Kent Williams norman-k-williams at uiowa.edu
>
>
>
>
>
>
> ________________________________
> 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.
> ________________________________
> _______________________________________________
> 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
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://www.itk.org/mailman/private/insight-developers/attachments/20110324/5e70dc7f/attachment.htm>