SVN does not recognize modified files

Question

I made changes to the folder named "branch", and now that it works, I want to move the entire src folder to the "trunk" folder. But, having copied src from the local branch, pasting into the local trunk and transmitting SVN does not oblige anything. Its like nothing has changed. Any idea how to do this?

Related question: How can I get subversion to commit an immutable file? (Will work for me, but I don’t know anything about properties, exactly what can I change and with what value does something fail?)

Answer 1

You cannot do this because you are going to override svn metadata that will cause all kinds of problems.

If the branch was actually a branch and a working copy, you need to read svn merge to return the changes to trunk .

If it was a folder outside the working copy, the easiest way is to put it back in rsync and use --exclude=.svn , which does not synchronize the .svn metadata.

Answer 2

If you are running Windows, try copying all the files, but not the .svn folders.

Aside, I might be missing something, but that doesn't sound right. As a rule, you commit your changes to the repository on a branch, and then merge this branch into a trunk. What you described seems to be a little cheating. It is useful for me to think in terms of repository files, not local files.

Answer 3

From what you are describing (by making changes to the verified branch and then trying to fix them on the trunk by copying them at the file system level), you are trying to bypass SVN by working against it, rather than working with it.

I suggest you start by reading the most important chapters of the SVN book to familiarize yourself with how to use SVN. This should not last more than a few hours and is likely to pay off within a few days. When you need to work with SVN, working with it, and not against it, will ultimately save you a lot of trouble.