# HG changeset patch
# User cl
# Date 1303957180 25200
# Node ID fb9ee99c43327d6f84a31111db35ab9869c4383c
# Parent  dcfe74f1c6553c556e7d361c30b0b614eb5e40f6# Parent  3bd41d40ab97066a29f1f9d24d9b0eaf325b56c0
Merge

diff -r dcfe74f1c655 -r fb9ee99c4332 .hgignore
--- a/.hgignore	Thu Apr 21 15:32:42 2011 -0700
+++ b/.hgignore	Wed Apr 27 19:19:40 2011 -0700
@@ -2,3 +2,4 @@
 ^dist/
 /nbproject/private/
 ^webrev
+^.hgtip
diff -r dcfe74f1c655 -r fb9ee99c4332 Makefile
--- a/Makefile	Thu Apr 21 15:32:42 2011 -0700
+++ b/Makefile	Wed Apr 27 19:19:40 2011 -0700
@@ -97,7 +97,7 @@
 endef
 
 # Generic build of basic repo series
-generic_build_repo_series::
+generic_build_repo_series:: $(SOURCE_TIPS)
 	$(MKDIR) -p $(OUTPUTDIR)
 	$(MKDIR) -p $(OUTPUTDIR)/j2sdk-image
 	@$(call StartTimer)
@@ -243,6 +243,14 @@
 debug_build:: build_debug_image
 fastdebug_build:: build_fastdebug_image
 
+# The source tips are stored with the relative path to the repo.
+#   This file will be used when constructing the jdk image.
+source_tips: $(SOURCE_TIPS)
+	$(CAT) $<
+$(SOURCE_TIPS): FRC
+	@$(prep-target)
+	@$(call GetSourceTips)
+
 clobber:: REPORT_BUILD_TIMES=
 clobber:: 
 	$(RM) -r $(OUTPUTDIR)/*