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

[Brad King]

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