[Insight-developers] Data submodule was reverted again ( staging check needed? )

[Bill Lorensen]

Can the message include explicit instructions on what to do to resolve
the problem?

On Wed, Jan 26, 2011 at 11:39 AM, Brad King <brad.king at kitware.com> wrote:
> On 01/26/2011 09:30 AM, Brad King wrote:
>> On 01/26/2011 09:10 AM, Bradley Lowekamp wrote:
>>> Are you going to add this as a local commit hook and/or the staging area?
>>
>> I'm trying to do both.
>
> I got the server-side one working.  A direct rewind will be rejected with:
>
> remote: ----------------------------------------------------------------------
> remote: commit c8541e7b rewinds the submodule at
> remote:   Testing/Data
> remote: from commit 47e9898e to its ancestor 55dfde42:
> remote:   parent c8541e7b^1 (d824897f) references submodule commit 47e9898e
> remote: ----------------------------------------------------------------------
>
> A merge that rewinds with respect to at least one parent will fail with:
>
> remote: ----------------------------------------------------------------------
> remote: commit b748296b rewinds the submodule at
> remote:   Testing/Data
> remote: from commit 8e8b8c35 to its ancestor 47e9898e:
> remote:   parent b748296b^1 (dc9a8b90) references submodule commit 47e9898e
> remote:   parent b748296b^2 (7dd812ba) references submodule commit 8e8b8c35
> remote: ----------------------------------------------------------------------
>
> -Brad K
> _______________________________________________
> 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
>