Can't switch to trunk

svn merge tortoisesvn visualsvn
MikaelMadrid picture MikaelMadrid · Jul 26, 2013 · Viewed 8k times · Source

I'm just getting started with SVN using the tools mentioned above, as for normal updating and committing I didn't have any problems, my problem is now when I'm trying to update my trunk with my branch changes.

First off, I started using the branch/tags option to created the branch from the trunk (is this the correct way to do it? or can I just copy the content from the trunk to the branch folder?).

After some changes done in the branch folder, I'm trying to copy those changes to the trunk, following other answers on here they say to switch the working directory to the trunk, but whenever I try to do so I get

'https://sc-mika/svn/repo.test/trunk' shares no common ancestry  with 'C:/Users/SC'.

What is it that I'm doing wrong?

Answer

Lazy Badger picture Lazy Badger · Jul 26, 2013

In order to get branch's changes in trunk, you must merge branch into trunk (not just switch your WC) - read SVN Book

Related questions

Using TortoiseSVN how do I merge changes from the trunk to a branch and vice versa?

I've been reading up on branching/merging with Subversion 1.5 using the excellent and free Version Control with Subversion book. I think that I understand how to use the Subversion command line client to perform the actions that I need most …

Read More
Remove unnecessary svn:mergeinfo properties

When I merge stuff in my repository Subversion wants to add/change a lot of svn:mergeinfo properties to files that are totally unrelated to the things that I want to merge. Questions about this behaviour have been asked before …

Read More
SVN Mergeinfo properties on paths other than the working copy root

I have an SVN repository where I have trunk and a branch. I intend to merge the trunk into the branch at regular intervals, however, when I do this I see many property status changes, in addition to actual file …

Read More