Mercurial > hg > mercurial
changeset 739:c27df31c72fc
Merge
author | eugene.petrenko@jetbrains.com |
---|---|
date | Thu, 23 Jan 2014 15:17:23 +0100 |
parents | 1e4021519ff3 (current diff) ecbca39d0aef (diff) |
children | 7fe4a31c5a76 |
files | |
diffstat | 2 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial-server/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialVcsSupport.java Thu Jan 23 15:16:10 2014 +0100 +++ b/mercurial-server/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialVcsSupport.java Thu Jan 23 15:17:23 2014 +0100 @@ -390,7 +390,7 @@ .setUsePullProtocol(false) .useUncompressedTransfer(false) .call(); - cloneOfSubrepoMirror.setDefaultPath(subrepoConfig.url()); + cloneOfSubrepoMirror.setDefaultPath(subrepoUrl); Map<String, SubRepo> subSubrepos = subrepo.getSubrepositories(subrepoConfig.revision()); if (!subSubrepos.isEmpty())
--- a/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/SubrepoPatchTest.java Thu Jan 23 15:16:10 2014 +0100 +++ b/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/SubrepoPatchTest.java Thu Jan 23 15:17:23 2014 +0100 @@ -80,8 +80,8 @@ myVcs.getCollectChangesPolicy().collectChanges(myRoot, "e4eced2b7381", "d64d9799c143", CheckoutRules.DEFAULT); //delete remote subrepos to make sure patch is build from the clone on the server - delete(myRemoteRepo2); - delete(myRemoteRepo3); + delete(new File(myRemoteRepo2, ".hg")); //remove .hg but leave parent dir untouched, url resolution needs that + delete(new File(myRemoteRepo3, ".hg")); setName("clean_patch_recursive_subrepos"); checkPatchResult(buildPatch(myVcs, myRoot, null, "d64d9799c143", CheckoutRules.DEFAULT).toByteArray());