Mercurial > hg > mercurial
changeset 396:85cc92fb5dfa
Merge branch Faradi-7.0.x
| author | Dmitry Neverov <dmitry.neverov@jetbrains.com> |
|---|---|
| date | Wed, 29 Feb 2012 12:26:27 +0400 |
| parents | 88480a85f888 (current diff) 0dc8e99dc529 (diff) |
| children | 3491c67a0b35 |
| files | |
| diffstat | 3 files changed, 3 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial-agent/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialIncludeRuleUpdater.java Thu Feb 16 20:14:30 2012 +0400 +++ b/mercurial-agent/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialIncludeRuleUpdater.java Wed Feb 29 12:26:27 2012 +0400 @@ -137,7 +137,7 @@ if (!Settings.isValidRepository(mirrorDir)) { initRepository(settings, mirrorDir, false); } - final String defaultPullUrl = getDefaultPullUrl(settings, true); + final String defaultPullUrl = getDefaultPullUrl(settings, false); myLogger.message("Start pulling changes from " + removePrivateData(defaultPullUrl, Collections.singleton(settings.getPassword()))); new PullCommand(settings, mirrorDir).execute(myPullTimeout); myLogger.message("Local mirror changes successfully pulled");
--- a/mercurial.ipr Thu Feb 16 20:14:30 2012 +0400 +++ b/mercurial.ipr Wed Feb 29 12:26:27 2012 +0400 @@ -436,6 +436,7 @@ <library name="TeamCity-TestsAPI"> <CLASSES> <root url="jar://$TeamCityDistribution$/devPackage/tests/patches-test.jar!/" /> + <root url="jar://$TeamCityDistribution$/devPackage/tests/tests-support.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES />
--- a/mercurial.xml Thu Feb 16 20:14:30 2012 +0400 +++ b/mercurial.xml Wed Feb 29 12:26:27 2012 +0400 @@ -124,6 +124,7 @@ <path id="library.teamcity-testsapi.classpath"> <pathelement location="${path.variable.teamcitydistribution}/devPackage/tests/patches-test.jar"/> + <pathelement location="${path.variable.teamcitydistribution}/devPackage/tests/tests-support.jar"/> </path> <path id="library.teamcityapi-agent.classpath">