I guess the way I'd look at it is that because of the deprecation, the build is already broken. It might be broken differently if you merge your branch into dev, but hopefully it'll be less broken. Even if what you have isn't 100% right, it's still going to be better, and we can work on fixing it completely.

H

On Thu, Oct 4, 2018 at 12:58 PM Syd Bauman <s.bauman@northeastern.edu> wrote:
But you mis-interpret the problem. I did *not* check in a version of
P5 w/o the old datatypes to dev. (I created a new branch for it.) But
the build process barfs on the old datatypes, because it notices that
the @validUntil has expired. (Because I haven't checked into dev the
version that no longer has those old datatypes.) I.e., this is more
an error of omission than comission.

The good news is I expect to have a good chunk of time to look at
this within the next 36 hours.

But perhaps I should just try checking in the changes I made to my
local branch. After all, it won't be worse than it is now -- broken.

Hugh or other gitxpert -- is there a safe way to
 a) merge changes made recently in dev to sydb-endDeprecation_2018-10-01
 b) merge sydb-endDeprecation_2018-10-01 back into dev such that it
    can be backed out if things are dramatically worse (which I don't
    think they will be)?

For that matter, do I need to even bother with (a)?

> I know Syd was trying to get rid of the old datatypes. But when I
> was a lad, we made sure that the P5 dev tree was left usable after
> a release, even if it meant reverting desirable changes that hadn't
> quite worked.

> > It’s all because you went and invented Pure Odd. Syd was just
> > getting rid of the old data types, etc.. I don’t think he’s
> > merged those changes yet.

> >> I updated Stylesheets, and pulled the latest P5 sources, and ran "make clean; make"
> >>
> >> Everything worked up to the point where the "special purpose"
> >> validity checks began. At that point I got a shed load of
> >> annoying errors, starting with
> >> ...
> >> Tell me, what have I done to deserve this?
_______________________________________________
Tei-council mailing list
Tei-council@lists.tei-c.org
http://lists.lists.tei-c.org/mailman/listinfo/tei-council