Logo Questions Linux Laravel Mysql Ubuntu Git Menu
 

Tortoise SVN Switch Branch Command Error - "Shares No Common Ancestry"

When I try to do "switch" to change a directory to a different branch I get a strange error message.

This is how repository is set up looking at it from the host's website. I used to have a branch called bugfix-lobby-quirks, but it was deleted after I merged it to trunk. This and the new feature-in-game-opponents-cards were both branched off of trunk.

enter image description here

Now I want to take my checked out working copy "switched" from the deleted branch to this new branch. I have the bugfix-lobby-quirks branch already checked out on my computer since I was just working on it. What I want to do is switch everything in this folder to everything in the new branch I choose, which is nice since they aren't really all that different. This is what svn switch means, right?

enter image description here

So then I click switch and a popup comes up. It automatically recognizes the branch and displays it in the list here so I choose it.

enter image description here

Unfortunately, doing this leads to this error message every time.

enter image description here

It's not a happy day. It's a sad day.

Ok. So what am I doing wrong?

like image 610
Mc' Flips Avatar asked Dec 15 '14 03:12

Mc' Flips


People also ask

How do I switch to a branch in SVN?

If you're currently inside the directory vendors , which was branched to vendors-with-fix , and you'd like to switch your working copy to that branch: $ svn switch http://svn.red-bean.com/repos/branches/vendors-with-fix . U myproj/foo. txt U myproj/bar.

How do I branch a tortoise in SVN?

Creating Branches in TortoiseSVN To create a branch with TortoiseSVN, select the folder in your working copy which you want to copy to a branch or tag, then right-click and select the command TortoiseSVN → Branch/Tag....

How do I delete a branch in TortoiseSVN?

To delete the branch after you're finished with it, the simplest thing to do is choose TortoiseSVN->Repo Browser. From there, assuming you did this from your branch, it should already be highlighted. In any event, navigate to your branch in the treeview on the left, and then right-click and select Delete.

What is my working copy in SVN?

Working copies A Subversion working copy is your own private working area, which looks like any other ordinary directory on your system. It contains a COPY of those files which you will have been editing on the website. You can edit these files however you wish, in the usual way.


2 Answers

Click on the "ignore ancestry" checkbox in the svn switch dialog.

like image 104
Chris Avatar answered Oct 09 '22 10:10

Chris


You may get this because you were trying to switch one of your sub folders instead of doing the top level folder. That is, you were trying to switch just folder trunk/application instead of trunk.

like image 36
Travis Avatar answered Oct 09 '22 08:10

Travis