From: Rod Whitby <rod@whitby.id.au>
Date: Mon, 11 Jul 2005 19:12:50 +0000 (+0000)
Subject: Made the push targets do an update (and required merge) first
X-Git-Tag: Release-2010-05/1~9453^2~2960^2^2~9^2~2^2~3^2^2~4^2~146
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bb37e057dd1f4ccde852d619a179d7e7014938f6;p=openembedded.git

Made the push targets do an update (and required merge) first
---

diff --git a/Makefile b/Makefile
index f4b3139e3f..464ed3f904 100644
--- a/Makefile
+++ b/Makefile
@@ -137,11 +137,11 @@ clobber-optware:
 # Targets for use by those with write access to the repositories
 
 .PHONY: push-master
-push-master: MT/revision
+push-master: update-master
 	monotone push
 
 .PHONY: push-openembedded
-push-openembedded: openembedded/conf/machine/nslu2.conf
+push-openembedded: update-openembedded
 	( cd openembedded ; monotone push )
 
 # Targets for use by core team members only