Patchwork [buildfix-svn] tests: fix test-convert-hg-svn.t for e34abf9e8c

login
register
mail settings
Submitter Augie Fackler
Date Sept. 15, 2017, 7:34 p.m.
Message ID <6527d101d236a8e54225.1505504043@augie-macbookpro2.roam.corp.google.com>
Download mbox | patch
Permalink /patch/23919/
State Rejected
Headers show

Comments

Augie Fackler - Sept. 15, 2017, 7:34 p.m.
# HG changeset patch
# User Augie Fackler <augie@google.com>
# Date 1505503981 14400
#      Fri Sep 15 15:33:01 2017 -0400
# Node ID 6527d101d236a8e54225772f077f3a175bf17b75
# Parent  99a25fd51eee06baf00117114f84b630dd75f15e
tests: fix test-convert-hg-svn.t for e34abf9e8c

For some reason this test should have been specifying
convert.svn.trunk all along, but the listed commit was what broke
things.
via Mercurial-devel - Sept. 15, 2017, 9:02 p.m.
On Fri, Sep 15, 2017 at 12:34 PM, Augie Fackler <raf@durin42.com> wrote:
> # HG changeset patch
> # User Augie Fackler <augie@google.com>
> # Date 1505503981 14400
> #      Fri Sep 15 15:33:01 2017 -0400
> # Node ID 6527d101d236a8e54225772f077f3a175bf17b75
> # Parent  99a25fd51eee06baf00117114f84b630dd75f15e
> tests: fix test-convert-hg-svn.t for e34abf9e8c
>
> For some reason this test should have been specifying
> convert.svn.trunk all along, but the listed commit was what broke
> things.

After some testing, it turns out that the config is also read here:
https://www.mercurial-scm.org/repo/hg/file/24bf823377fc/hgext/convert/subversion.py#l406.
There, the default is effectively None. So I'll drop Boris's patch
instead and he can send a new version.

Patch

diff --git a/tests/test-convert-hg-svn.t b/tests/test-convert-hg-svn.t
--- a/tests/test-convert-hg-svn.t
+++ b/tests/test-convert-hg-svn.t
@@ -8,6 +8,8 @@ 
   > [extensions]
   > convert =
   > mq =
+  > [convert]
+  > svn.trunk =
   > EOF
 
   $ SVNREPOPATH=`pwd`/svn-repo