launchpad-reviewers team mailing list archive

[William Grant <me@xxxxxxxxxxxxxxxxxx>]

William Grant has proposed merging lp:~wgrant/launchpad/remove-pqm-check-targets into lp:launchpad.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)
Related bugs:
  #731015 check_(db_)merge Makefile targets no longer used
  https://bugs.launchpad.net/bugs/731015

For more details, see:
https://code.launchpad.net/~wgrant/launchpad/remove-pqm-check-targets/+merge/52498

PQM no longer uses the check_merge or check_db_merge Makefile targets, implementing their checks directly in the precommit hook. To avoid confusion, they should be removed from the tree.
-- 
https://code.launchpad.net/~wgrant/launchpad/remove-pqm-check-targets/+merge/52498
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~wgrant/launchpad/remove-pqm-check-targets into lp:launchpad.

=== modified file 'Makefile'
--- Makefile	2011-02-25 22:54:52 +0000
+++ Makefile	2011-03-08 00:56:59 +0000
@@ -76,14 +76,6 @@
 	$(MAKE) -C doc/ html
 
 # Run by PQM.
-check_merge: $(BUILDOUT_BIN)
-	[ `PYTHONPATH= bzr status -S database/schema/ | \
-		grep -v "\(^P\|pending\|security.cfg\|Makefile\|unautovacuumable\|_pythonpath.py\)" | wc -l` -eq 0 ]
-	${PY} lib/lp/tests/test_no_conflict_marker.py
-
-check_db_merge: $(PY)
-	${PY} lib/lp/tests/test_no_conflict_marker.py
-
 check_config: build
 	bin/test -m canonical.config.tests -vvt test_config
 
@@ -467,8 +459,8 @@
 
 .PHONY: apidoc buildout_bin check doc tags TAGS zcmldocs realclean clean debug \
 	stop start run ftest_build ftest_inplace test_build test_inplace \
-	pagetests check check_merge schema default launchpad.pot \
-	check_merge_ui pull scan sync_branches reload-apache hosted_branches \
-	check_db_merge check_mailman check_config jsbuild jsbuild_lazr \
-	clean_js clean_buildout buildonce_eggs build_eggs sprite_css \
-	sprite_image css_combine compile check_schema pydoctor clean_logs \
+	pagetests check schema default launchpad.pot pull_branches \
+	scan_branches sync_branches reload-apache hosted_branches \
+	check_mailman check_config jsbuild jsbuild_lazr clean_js \
+	clean_buildout buildonce_eggs build_eggs sprite_css sprite_image \
+	css_combine compile check_schema pydoctor clean_logs \