From: Peter Rabbitson Date: Sun, 26 Aug 2012 11:08:20 +0000 (+0200) Subject: Moar merge comments X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=6f2d43956ce519880f35670ac82540713553b097;p=dbsrgits%2FDBIx-Class-Historic.git Moar merge comments --- diff --git a/TO_MERGE b/TO_MERGE index 60e10be..6011087 100644 --- a/TO_MERGE +++ b/TO_MERGE @@ -1,3 +1,10 @@ +======= +To clarify comments below - mst originally misread the point of the branch +There seems to be agreement that this branch should be marked as rejected, +and deleted when RT#73876 is resolved (which is a DBIC::SL issue, and the +ticket has been moved the the appropriate queue a while ago) +======= + I would propose that in fact this branch shouldn't test DBIC_TRACE - but in order to be able to warn on redefinition of relationships we need to add a '+foo' form for relationships. Possibly an env var to squelch the warning