On Thursday 30 June 2011, Ralf Wildenhues wrote: > * Ralf Wildenhues wrote on Thu, Jun 30, 2011 at 10:52:16PM CEST: > > * Stefano Lattarini wrote on Thu, Jun 30, 2011 at 05:12:38PM CEST: > > > I think that the patches introducing support for AM_TESTSUITE_ENVIRONMENT > > > should be merged into maint, as they'd make a nice addition for 1.11.2. > > > I've verified that almost all these patches are based off of maint, and > > > the few that aren't (e.g., `v1.11-867-g1e005df') > > > > I don't have v1.11-867-g1e005df nor v1.11-351-g3e334a2 in my tree. > > D'oh. EWRONGREPO. I still don't have the latter commit in my tree, > Weird. The commit is present in the official automake repo:
$ hash=`git log -1 --format=%H v1.11-351-g3e334a2` $ wget --server-response -O/dev/null "http://git.savannah.gnu.org/gitweb/?p=automake.git;a=commit;h=$hash"; --2011-06-30 23:17:14-- http://git.savannah.gnu.org/gitweb/?p=automake.git;a=commit;h=3e334a272fa601bebb5896e25cfb63f34822a275 Resolving git.savannah.gnu.org... 140.186.70.72 Connecting to git.savannah.gnu.org|140.186.70.72|:80... connected. HTTP request sent, awaiting response... HTTP/1.1 200 OK Date: Thu, 30 Jun 2011 21:17:14 GMT ... 2011-06-30 23:17:15 (70.4 KB/s) - “/dev/null” saved [7893] > and the former has many many commits on top of maint. > Yes, because it's based off of master. As I've said, it shouldn't be merged in maint, at most cherry-picked; and I've also question whether that would be worthwhile (see my quoted answer below). > So no, you cannot > merge that into maint. That would require more than just a cursory > review, and I don't see the gain right now. > Is this still true in light of the above? > > > are just testsuite > > > additions (and could probably be cherry-picked anyway, but I'm not sure > > > whther that would be worthwhile). My proposal is to push the last > > > relevant commit (should be `v1.11-351-g3e334a2') to a new public branch > > > 'am-tests-environment', tie up the last loose ends (if any), and finally > > > merge that branch into maint. Objections? > > Sorry, > Ralf > Regards, Stefano
