From 8aee402b8b06dda6a228cb48de7c9f111c614baf Mon Sep 17 00:00:00 2001
From: Rod Whitby <rod@whitby.id.au>
Date: Sat, 9 Jul 2005 08:38:40 +0000
Subject: [PATCH] Fixed the update-openembedded target so that it could handle
 multiple heads

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 7d0b05ca15..302d404aec 100644
--- a/Makefile
+++ b/Makefile
@@ -77,10 +77,10 @@ update-bitbake: bitbake/bin/bitbake
 .PHONY: update-openembedded
 update-openembedded: openembedded/conf/machine/nslu2.conf
 	monotone pull
-	( cd openembedded ; monotone update )
 	if [ `monotone automate heads org.openembedded.nslu2-linux | wc -l` != "1" ] ; then \
 	  monotone merge -b org.openembedded.nslu2-linux ; \
 	fi
+	( cd openembedded ; monotone update )
 
 .PHONY: update-oe-symlinks
 update-oe-symlinks: oe-symlinks/packages
-- 
2.39.5