Mercurial > public > develkit
changeset 145:cea4e793a3f4
handle merge working directories (multiple parent branches)
author | Dave Smith <smith@nwoca.org> |
---|---|
date | Fri, 25 Oct 2013 21:29:39 +0100 |
parents | 7fead80bdd6a |
children | 8ef0a02dd76e |
files | init.gradle |
diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/init.gradle Fri Oct 25 21:27:11 2013 +0100 +++ b/init.gradle Fri Oct 25 21:29:39 2013 +0100 @@ -31,7 +31,7 @@ def parent = parents.find { it != 'default' } gradle.ext.branchName = parent ?: gradle.branchName gradle.ext.hgRepositoryUrl = ("hg path".execute().text.split('=') ?: ['',''] )[1].trim() -} catch (e) { } +} catch (e) { println e } if (file('.hgflow').exists()) {