[Insight-developers] The release branch looks a bit off...

[Matt McCormick]

On Fri, Mar 30, 2012 at 9:36 AM, Bradley Lowekamp
<blowekamp at mail.nih.gov> wrote:
> 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.
>

Well, it all depends if there are people tracking the release branch
and would be bothered by a non-ff merge, which I suppose there are.

> 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...

I don't think a revert is necessary.  We would have to change the
CMakeLists.txt before a v4.1.1 tag, anyway.  In that case, we will
have to modify the CMakeLists.txt version when merging release into
master, too.

Matt


>
> Brad
>
>
> On Mar 30, 2012, at 9:26 AM, Matt McCormick wrote:
>
> Hi Brad,
>
> This is likely my mistake.  Would it be OK if we moved the release
> branch to point the v4.1.0 tag?  I don't think there are any other
> release based patches on Gerrit other than the one you pushed today.
>
> Alternatively, we could make a commit to change the version to 4.1.1
> before we made a v4.1.1 tag.
>
> Thanks,
> Matt
>
> On Fri, Mar 30, 2012 at 8:15 AM, Bradley Lowekamp
> <blowekamp at mail.nih.gov> wrote:
>
> The version for the release branch appear to be at 4.2, and not 4.1.
>
>
> $ git log origin/release
>
> commit 235a1d703cc8fc6c0703b7905601026437dc4072
>
> Merge: 6013036 744a66c
>
> Author: Matt McCormick <matt.mccormick at kitware.com>
>
> Date:   Sat Mar 3 08:42:15 2012 -0500
>
>
>     Merge topic 'VersionBump'
>
>
>     744a66c ENH: Bump version to 4.2
>
>
> commit 60130363315fbba88b40df6b08beb2a9bb9218d2
>
> Author: KWSys Robot <kwrobot at kitware.com>
>
> Date:   Sat Mar 3 00:01:03 2012 -0500
>
>
>     KWSys Nightly Date Stamp
>
>
> commit 744a66cd8179b3734508398b39d1a11924f5d5e0
>
> Author: Matt McCormick <matt.mccormick at kitware.com>
>
> Date:   Fri Mar 2 11:07:41 2012 -0500
>
>
>     ENH: Bump version to 4.2
>
>
>     Change-Id: I23a2636182fe31890a3519dfacc227ec666dce98
>
>
> commit 4af483dd16e960583f0c02633f594fd253844a61
>
> Author: KWSys Robot <kwrobot at kitware.com>
>
> Date:   Fri Mar 2 00:01:08 2012 -0500
>
>
>     KWSys Nightly Date Stamp
>
>
> ========================================================
>
>
> Bradley Lowekamp
>
>
> Medical Science and Computing for
>
>
> Office of High Performance Computing and Communications
>
>
> National Library of Medicine
>
>
> blowekamp at mail.nih.gov
>
>
>
>
>
>
> _______________________________________________
>
> 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.php
>
>
> 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
>
>
>
> ========================================================
>
> Bradley Lowekamp
>
> Medical Science and Computing for
>
> Office of High Performance Computing and Communications
>
> National Library of Medicine
>
> blowekamp at mail.nih.gov
>
>
>
>