[Insight-developers] git branch question

[Johnson, Hans J]

Nick,

This should not be too hard.  I don't think that Bill's cherry-picking
solution will work though.

1) I think you want to checkout the patchset from gerrit
git fetch http://review.source.kitware.com/p/ITK refs/changes/92/3092/9 &&
git checkout FETCH_HEAD -b SimpleRegistration
1a ) (OPTIONAL -- git fetch; git rebase origin/master )
2) In a new commit, make you changes, but retain the topic branch name.
3) Simply push the entire topic branch (both the old new patch sets will
be sent to gerrit).

Hans



--
Hans J. Johnson, Ph.D.
hans-johnson at uiowa.edu
Assistant Professor of Psychiatry
University of Iowa Carver College of Medicine
W278 GH, 200 Hawkins Drive

Iowa City, Iowa 52242
Phone:  319-353-8587







-----Original Message-----
From: Nicholas Tustison <ntustison at gmail.com>
Date: Mon, 31 Oct 2011 16:16:24 -0400
To: ITK <insight-developers at itk.org>
Subject: [Insight-developers] git branch question

Hi,

I haven't had to do this before but I assume it's pretty easy.  I
currently have a gerrit topic (A) pending and I'm preparing another
topic (B) which depends on A.  My questions are:

1.  How do I properly pull branch A into B on my local machine to
get things working due to dependencies?
2.  Once I'm ready to push B to gerrit, what are the magic incantations
I need to ensure that the gerrit topics are coordinated properly?

I would very much appreciate if somebody could point me to a wiki page
or something.

Thanks,
Nick

_______________________________________________
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.
________________________________
-------------- next part --------------
A non-text attachment was scrubbed...
Name: default.png
Type: image/png
Size: 17421 bytes
Desc: default.png
URL: <http://www.itk.org/mailman/private/insight-developers/attachments/20111031/b5f2f11a/attachment.png>