# HG changeset patch
# User Dave Smith <smith@nwoca.org>
# Date 1382732831 -3600
# Node ID 7fead80bdd6acbba3dfd771c47f6e796d88b4fce
# Parent  1963264c39c47f0d509375d2ffb1f24621474946
handle merge working directories (multiple parent branches)

diff -r 1963264c39c4 -r 7fead80bdd6a init.gradle
--- a/init.gradle	Fri Oct 25 21:21:28 2013 +0100
+++ b/init.gradle	Fri Oct 25 21:27:11 2013 +0100
@@ -27,6 +27,7 @@
 try {
 	gradle.ext.branchName = "hg branch".execute().text.trim()
 	def parents = "hg parents --template \"{branch} \"".execute().text.trim().split(" ")
+	println "working directory parents: $parents "
 	def parent = parents.find { it != 'default' } 
 	gradle.ext.branchName = parent ?: gradle.branchName
 	gradle.ext.hgRepositoryUrl = ("hg path".execute().text.split('=') ?: ['',''] )[1].trim()
@@ -37,7 +38,7 @@
 	def flows = new Properties()
 	flows.load(file('.hgflow').newReader())
 	flows.stringPropertyNames().each {
-		if (!it.startsWith("[") && gradle.ext.branchName.startsWith(flows.getProperty(it))) {
+		if (!it.startsWith("[") && gradle.branchName.startsWith(flows.getProperty(it))) {
 			gradle.ext.branchStream = it
 		}	
 	}