<html><head></head><body style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space; "><div>I believe is a big no-no, to rewind a branch as public as the "release" of ITK. This would cause anyone who is following the release brach to get a non-ff merge. </div><div><br></div><div>Likely it's best to revert the the commit which upped the version. Now, when release is merged into master I think it may also revert the master back to version 4.1... so that may need to be manual corrected in the merge... Not sure what is best there. I'd hope there is an accredited git expert near by...</div><div><br></div><div>Brad</div><div><br></div><div><br><div><div>On Mar 30, 2012, at 9:26 AM, Matt McCormick wrote:</div><br class="Apple-interchange-newline"><blockquote type="cite"><div>Hi Brad,<br><br>This is likely my mistake. Would it be OK if we moved the release<br>branch to point the v4.1.0 tag? I don't think there are any other<br>release based patches on Gerrit other than the one you pushed today.<br><br>Alternatively, we could make a commit to change the version to 4.1.1<br>before we made a v4.1.1 tag.<br><br>Thanks,<br>Matt<br><br>On Fri, Mar 30, 2012 at 8:15 AM, Bradley Lowekamp<br><<a href="mailto:blowekamp@mail.nih.gov">blowekamp@mail.nih.gov</a>> wrote:<br><blockquote type="cite">The version for the release branch appear to be at 4.2, and not 4.1.<br></blockquote><blockquote type="cite"><br></blockquote><blockquote type="cite">$ git log origin/release<br></blockquote><blockquote type="cite">commit 235a1d703cc8fc6c0703b7905601026437dc4072<br></blockquote><blockquote type="cite">Merge: 6013036 744a66c<br></blockquote><blockquote type="cite">Author: Matt McCormick <<a href="mailto:matt.mccormick@kitware.com">matt.mccormick@kitware.com</a>><br></blockquote><blockquote type="cite">Date: Sat Mar 3 08:42:15 2012 -0500<br></blockquote><blockquote type="cite"><br></blockquote><blockquote type="cite"> Merge topic 'VersionBump'<br></blockquote><blockquote type="cite"><br></blockquote><blockquote type="cite"> 744a66c ENH: Bump version to 4.2<br></blockquote><blockquote type="cite"><br></blockquote><blockquote type="cite">commit 60130363315fbba88b40df6b08beb2a9bb9218d2<br></blockquote><blockquote type="cite">Author: KWSys Robot <<a href="mailto:kwrobot@kitware.com">kwrobot@kitware.com</a>><br></blockquote><blockquote type="cite">Date: Sat Mar 3 00:01:03 2012 -0500<br></blockquote><blockquote type="cite"><br></blockquote><blockquote type="cite"> KWSys Nightly Date Stamp<br></blockquote><blockquote type="cite"><br></blockquote><blockquote type="cite">commit 744a66cd8179b3734508398b39d1a11924f5d5e0<br></blockquote><blockquote type="cite">Author: Matt McCormick <<a href="mailto:matt.mccormick@kitware.com">matt.mccormick@kitware.com</a>><br></blockquote><blockquote type="cite">Date: Fri Mar 2 11:07:41 2012 -0500<br></blockquote><blockquote type="cite"><br></blockquote><blockquote type="cite"> ENH: Bump version to 4.2<br></blockquote><blockquote type="cite"><br></blockquote><blockquote type="cite"> Change-Id: I23a2636182fe31890a3519dfacc227ec666dce98<br></blockquote><blockquote type="cite"><br></blockquote><blockquote type="cite">commit 4af483dd16e960583f0c02633f594fd253844a61<br></blockquote><blockquote type="cite">Author: KWSys Robot <<a href="mailto:kwrobot@kitware.com">kwrobot@kitware.com</a>><br></blockquote><blockquote type="cite">Date: Fri Mar 2 00:01:08 2012 -0500<br></blockquote><blockquote type="cite"><br></blockquote><blockquote type="cite"> KWSys Nightly Date Stamp<br></blockquote><blockquote type="cite"><br></blockquote><blockquote type="cite">========================================================<br></blockquote><blockquote type="cite"><br></blockquote><blockquote type="cite">Bradley Lowekamp<br></blockquote><blockquote type="cite"><br></blockquote><blockquote type="cite">Medical Science and Computing for<br></blockquote><blockquote type="cite"><br></blockquote><blockquote type="cite">Office of High Performance Computing and Communications<br></blockquote><blockquote type="cite"><br></blockquote><blockquote type="cite">National Library of Medicine<br></blockquote><blockquote type="cite"><br></blockquote><blockquote type="cite"><a href="mailto:blowekamp@mail.nih.gov">blowekamp@mail.nih.gov</a><br></blockquote><blockquote type="cite"><br></blockquote><blockquote type="cite"><br></blockquote><blockquote type="cite"><br></blockquote><blockquote type="cite"><br></blockquote><blockquote type="cite"><br></blockquote><blockquote type="cite">_______________________________________________<br></blockquote><blockquote type="cite">Powered by <a href="http://www.kitware.com">www.kitware.com</a><br></blockquote><blockquote type="cite"><br></blockquote><blockquote type="cite">Visit other Kitware open-source projects at<br></blockquote><blockquote type="cite"><a href="http://www.kitware.com/opensource/opensource.html">http://www.kitware.com/opensource/opensource.html</a><br></blockquote><blockquote type="cite"><br></blockquote><blockquote type="cite">Kitware offers ITK Training Courses, for more information visit:<br></blockquote><blockquote type="cite"><a href="http://kitware.com/products/protraining.php">http://kitware.com/products/protraining.php</a><br></blockquote><blockquote type="cite"><br></blockquote><blockquote type="cite">Please keep messages on-topic and check the ITK FAQ at:<br></blockquote><blockquote type="cite"><a href="http://www.itk.org/Wiki/ITK_FAQ">http://www.itk.org/Wiki/ITK_FAQ</a><br></blockquote><blockquote type="cite"><br></blockquote><blockquote type="cite">Follow this link to subscribe/unsubscribe:<br></blockquote><blockquote type="cite"><a href="http://www.itk.org/mailman/listinfo/insight-developers">http://www.itk.org/mailman/listinfo/insight-developers</a><br></blockquote><blockquote type="cite"><br></blockquote></div></blockquote></div><br><div>
<span class="Apple-style-span" style="border-collapse: separate; color: rgb(0, 0, 0); font-family: Helvetica; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; orphans: 2; text-align: -webkit-auto; text-indent: 0px; text-transform: none; white-space: normal; widows: 2; word-spacing: 0px; -webkit-border-horizontal-spacing: 0px; -webkit-border-vertical-spacing: 0px; -webkit-text-decorations-in-effect: none; -webkit-text-size-adjust: auto; -webkit-text-stroke-width: 0px; font-size: medium; "><span class="Apple-style-span" style="border-collapse: separate; -webkit-border-horizontal-spacing: 0px; -webkit-border-vertical-spacing: 0px; color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; -webkit-text-decorations-in-effect: none; text-indent: 0px; -webkit-text-size-adjust: auto; text-transform: none; orphans: 2; white-space: normal; widows: 2; word-spacing: 0px; "><div style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space; "><span class="Apple-style-span" style="border-collapse: separate; -webkit-border-horizontal-spacing: 0px; -webkit-border-vertical-spacing: 0px; color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; -webkit-text-decorations-in-effect: none; text-indent: 0px; -webkit-text-size-adjust: auto; text-transform: none; orphans: 2; white-space: normal; widows: 2; word-spacing: 0px; "><p style="margin-top: 0px; margin-right: 0px; margin-bottom: 0px; margin-left: 0px; "><font face="Helvetica" size="3" style="font: normal normal normal 12px/normal Helvetica; ">========================================================</font></p><p style="margin-top: 0px; margin-right: 0px; margin-bottom: 0px; margin-left: 0px; "><font face="Helvetica" size="3" style="font: normal normal normal 12px/normal Helvetica; ">Bradley Lowekamp<span class="Apple-converted-space"> </span><span class="Apple-converted-space"> </span></font></p><p style="margin-top: 0px; margin-right: 0px; margin-bottom: 0px; margin-left: 0px; "><font face="Helvetica" size="3" style="font: normal normal normal 12px/normal Helvetica; ">Medical Science and Computing for</font></p><p style="margin-top: 0px; margin-right: 0px; margin-bottom: 0px; margin-left: 0px; "><font face="Helvetica" size="3" style="font: normal normal normal 12px/normal Helvetica; ">Office of High Performance Computing and Communications</font></p><p style="margin-top: 0px; margin-right: 0px; margin-bottom: 0px; margin-left: 0px; "><font face="Helvetica" size="3" style="font: normal normal normal 12px/normal Helvetica; ">National Library of Medicine<span class="Apple-converted-space"> </span></font></p><p style="margin-top: 0px; margin-right: 0px; margin-bottom: 0px; margin-left: 0px; "><font face="Helvetica" size="3" style="font: normal normal normal 12px/normal Helvetica; "><a href="mailto:blowekamp@mail.nih.gov">blowekamp@mail.nih.gov</a></font></p><br class="Apple-interchange-newline"></span></div></span></span><br class="Apple-interchange-newline">
</div>
<br></div></body></html>