Error when switching to branch

[schweeneh]

First of all, thanks for making this tool, it's gonna be a big help.

The problem I'm having is when the tool tries to change the working folder for the branch in Vault. The trunk is already set to the working folder so the operation fails.

I may not be understanding how the tool works with branches. My understanding is that it sets the working folder for the trunk, checks in all commits from Vault to whatever I have the trunk set to which is "master". Then it sets the same working folder to the branch (this is where it fails) and checks in all of the branch commits into git on the branch I created which I called just "branch".

here's my config file with sensitive information removed:

<?xml version="1.0" encoding="utf-8" ?>
<configuration>
  <appSettings>
    <add key="Vault.Server" value=""/>
    <add key="Vault.User" value=""/>
    <add key="Vault.Password" value=""/>
    <add key="Vault.Repo" value="ADN Web Apps"/>
    <add key="Git.DomainName" value=""/>
    <add key="Convertor.WorkingFolder" value="C:\Users\csweeney\Documents\ADN Web Apps\QACTemp"/>
    <add key="Convertor.GitCmd" value="C:\Program Files (x86)\Git\bin\git.exe"/>
    <add key="Convertor.Paths" value="$/QAC/Trunk/~master;$/QAC/Branches/~branch"/>
  </appSettings>
</configuration>

[AndreyNikiforov]

I haven't been working with Vault for few years now, so my explanations below are based on what I remember + what I can deduce from [my own] code.

Working folder is the place where your git repo is building up. Do not map it to Vault source tree. When vault2git is processing Vault history, it will get files into working to match particular branch. E.g.

1. set Vault workingFolder to next mapping path (C:\Users\csweeney\Documents\ADN Web Apps\QACTemp to $/QAC/Trunk)
2. do git checkout ("git checkout master")
3. get files for next version from Vault (C:\Users\csweeney\Documents\ADN Web Apps\QACTemp will be updated with changes, adds, and deletes)
4. commit with git
5. repeat from 3) for all versions for this branch
6. repeat from 1) for all branches

Hope this helps
~Andrey