possible fix for #71

Author: JohnstonCode

src/commands.ts

@@ -77,7 +77,18 @@ class SwitchBranchItem implements QuickPickItem {
   }
 
   async run(repository: Repository): Promise<void> {
-    await repository.switchBranch(this.ref);
+    try {
+      await repository.switchBranch(this.ref);
+    } catch (error) {
+      if (/E195012/.test(error)) {
+        window.showErrorMessage(
+          "Path '.' does not share common version control ancestry with the requested switch location."
+        );
+        return;
+      }
+
+      window.showErrorMessage("Unable to switch branch");
+    }
   }
 }
 
@@ -367,7 +378,7 @@ export class SvnCommands {
         const repository = this.model.getRepository(resource);
 
         if (!repository) {
-          console.warn("Could not find git repository for ", resource);
+          console.warn("Could not find Svn repository for ", resource);
           return result;
         }
 

src/svn.ts

@@ -96,7 +96,7 @@ export class Svn {
   private svnPath: string;
   private version: string;
   private lastCwd: string = "";
-  
+
   private _onOutput = new EventEmitter();
   get onOutput(): EventEmitter {
     return this._onOutput;
@@ -118,7 +118,9 @@ export class Svn {
     }
 
     if (options.log !== false) {
-      this.log(`[${this.lastCwd.split(/[\\\/]+/).pop()}]$ svn ${args.join(" ")}\n`);
+      this.log(
+        `[${this.lastCwd.split(/[\\\/]+/).pop()}]$ svn ${args.join(" ")}\n`
+      );
     }
 
     let process = cp.spawn(this.svnPath, args, options);
@@ -224,14 +226,14 @@ export class Svn {
   }
 
   switchBranch(root: string, path: string) {
-    return this.exec(root, ["switch", path, "--ignore-ancestry"]);
+    return this.exec(root, ["switch", path]);
   }
 
   revert(files: any[]) {
     let args = ["revert"];
 
     for (let file of files) {
-      if (file instanceof Uri){
+      if (file instanceof Uri) {
         args.push(file.fsPath);
       } else {
         args.push(file);

src/svnRepository.ts

@@ -200,7 +200,10 @@ export class Repository {
 
     var branchUrl = repoUrl + "/" + ref;
 
-    const switchBranch = await this.svn.switchBranch(this.root, branchUrl);
+    const switchBranch = await this.svn.switchBranch(
+      this.workspaceRoot,
+      branchUrl
+    );
 
     if (switchBranch.exitCode !== 0) {
       throw new Error(switchBranch.stderr);