changeset 496:e4210c35aa24

Merge branch Faradi-7.1.x
author Dmitry Neverov <dmitry.neverov@jetbrains.com>
date Wed, 24 Oct 2012 17:34:06 +0400
parents 6ff7f6e77b98 (current diff) 7d3527fe4556 (diff)
children 5e902e2ef315
files
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/BaseCommand.java	Tue Oct 23 13:51:23 2012 +0400
+++ b/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/BaseCommand.java	Wed Oct 24 17:34:06 2012 +0400
@@ -47,7 +47,6 @@
   protected MercurialCommandLine createCommandLine() {
     MercurialCommandLine cli = createCL();
     cli.setWorkDirectory(myWorkDirectory.getAbsolutePath());
-    cli.setPassParentEnvs(true);
     return cli;
   }
 
@@ -55,6 +54,7 @@
     MercurialCommandLine cl = new MercurialCommandLine(getPrivateData());
     cl.setExePath(myHgPath);
     cl.setEnvParams(myCommandSettings.getHgEnv());
+    cl.setPassParentEnvs(true);
     return cl;
   }