Re: [Condor-devel] Important: V7_4-branch and derived

[Alan De Smet <adesmet@xxxxxxxxxxx>]

The problems with the repository are more complex than initially
expected.  It appears there was a bad merge to V7_4-branch.
There is also a secondary problem where V7_4-branch picked up
commits from master, but not via a merge.  Our current hypothesis
is a bad rebase is to blame.  Investigations are ongoing with
several staff involved.  Unfortunately a fix is unlikely today.

Based on our current understanding, pushing commits to master and
master derived branches is okay.  Please do not push commits to
V7_4-branch or derived branches.

There will be another email when things are resolved and
V7_4-branch is again open.  Fixes for your local repository will
likely be necessary; directions will be included in that email.

A ticket tracking this issue is available at
http://condor-wiki.cs.wisc.edu/index.cgi/tktview?tn=1089,0 ; note
that we're mostly using it as a scratch area for notes, so it's
jumbled.

-- 
Alan De Smet                              Condor Project Research
adesmet@xxxxxxxxxxx                http://www.cs.wisc.edu/condor/