I think I figured out the problem. When I created the first branch, it
was from a revision prior to the folder restructuring, which now makes
sense regarding the "no common ancestor" error. I just created a new
branch from a revision after the restructure, and I can switch back and
forth between it and trunk without problem.
So I think I'm good to go. I'll just have to use "--ignore-ancestry"
for that one, first branch.
Thanks!
-- Kevin
On 2/24/2014 1:47 PM, Kevin Ross wrote:
> Hello,
>
> When the project repository was setup, we didn't include branches,
> tags, and trunk (oversight on our part). It wasn't until we decided
> we wanted to start branching that we realized this mistake. So in
> TortoiseSVN repo-browser, I created branches, tags, and trunk folders,
> and from the repo-browser, moved the existing folders into the trunk
> folder.
>
> I also then created a branch from a specific revision, and it created
> the branch for me. I've committed changes to the branch (and to the
> trunk) without problems.
>
> However, if I try to "svn switch" between trunk and a branch, I get
> "no common ancestry" error (which I can override with
> --ignore-ancestry), which leads me to believe that I didn't recreate
> the folder hierarchy correctly.
>
> Can anyone help?
>
> Thanks!
> -- Kevin
>
Received on 2014-02-24 23:19:32 CET