Bug: impossible to switch back to the trunk after switching to any branch (branches are on second level subfolders)

[nick-kolesnikov]

• VSCode Version: 1.20.1
• OS Version: Windows 10 x64
• Extension Version: 1.21.2
• System Language: English
• SVN Version: 1.9.7

Issue

In case of custom svn folders layout (branches are on second level subfolders) on attempt to switch back to the trunk after switching to any branch the error throwing: Path 'c:\projects\test-project' does not share common version control ancestry with the requested switch location.

Steps to Reproduce

1. Create subfolder "test" in "branches" folder
2. Add some branches to branches/test
3. Add "svn.layout.branches": "branches/test" to the VSCode settings
4. Switch to any branch
5. Try to switch back to the trunk

SVN Output

[test-project]$ svn stat --xml --no-ignore --ignore-externals
[test-project]$ svn info --xml
[test-project]$ svn log -r BASE:HEAD -q --xml
[test-project]$ svn ls https://svn.company.local/svn/testProject/trunk --depth empty
[test-project]$ svn ls https://svn.company.local/svn/testProject/branches/ProcessingEngine
[test-project]$ svn ls https://svn.company.local/svn/testProject/tags
[test-project]$ svn switch https://svn.company.local/svn/testProject/branches/ProcessingEngine/2.0
[test-project]$ svn stat --xml --no-ignore --ignore-externals
[test-project]$ svn info --xml
[test-project]$ svn log -r BASE:HEAD -q --xml
[test-project]$ svn ls https://svn.company.local/svn/testProject/trunk --depth empty
[test-project]$ svn ls https://svn.company.local/svn/testProject/branches/ProcessingEngine
[test-project]$ svn ls https://svn.company.local/svn/testProject/tags
[test-project]$ svn switch https://svn.company.local/svn/testProject/trunk
svn: E195012: Path '.' does not share common version control ancestry with the requested switch location.  Use --ignore-ancestry to disable this check.
svn: E195012: 'https://svn.company.local/svn/testProject/trunk' shares no common ancestry with 'C:\projects\test-project'

[JohnstonCode]

@Eretik Subbranches are not supported currently. #117

[edgardmessias]

@JohnstonCode, the problem is not subbranches, but ancestry.

Maybe the branches are not copy from trunk, but new folder.

[JohnstonCode]

Okay, ill release it. see if it does anything. Really should get around to sorting out all this branch stuff. Next thing to do after properties.

[JohnstonCode]

@Eretik Try latest release

[nick-kolesnikov]

@JohnstonCode It works now, thanks.
But still there are small inconsistent:
in case of custom folder layout for trunk and branches:
"svn.layout.branches": "branches/test", "svn.layout.trunk": "trunk/test"
VSCode shows in left bottom corner trunk/test for trunk, but only branch name for branches.
But still I'm not sure if it's incorrect behaviour actually.

[JohnstonCode]

@Eretik it does seem inconsistent. I original idea never catered for subbranches. I do think tho that the bottom should probably show the full branch path. What do you think?

[nick-kolesnikov]

@JohnstonCode you mean branches/test/branch_1 according to my example? It's one of the option, I think. Another one: as far as user cnfigure the plugin to use specific folders for the trunk and branches - show just trunk for the trunk and just branch name for the branches. And third option - it could be configurable. For example, svn.layout.showFullPaths boolean param.
Last one is the best as I think, but what about you ideas about it?

[edgardmessias]

The problem is detect root of repository

[nick-kolesnikov]

@edgardmessias but now we are discussing only displaying of path to the trunk or the branch folder I thought. Switching to branches and back to the trunk for my case working correctly now with latest release. @JohnstonCode May be I should create another Issue for the discussion about displaying folder path?

[JohnstonCode]

@Eretik yeah do that

[nick-kolesnikov]

@JohnstonCode done: #204