Aprium Software

I was just adding a few images into subversion from the live linux server, when I updated my local copy....BANG! subversion hits me with this error.

svn: Can't move source to dest svn: Can't move '/.svn/tmp/prop-base/image.gif.svn-base' to '/.svn/prop-base/image.gif.svn-base': No such file or directory

If you are using the tags, branches and trunk setup in your subversion repository you will eventually need to merge your changes in a branch back into the trunk. This like most things in subversion is relatively easy once you understand the syntax.

The merge command needs two version numbers, these are a range of branch versions that subversion will collect the changes from. Most of the time you will want all changes made on your branch since you created it. On your branch working copy do a svn log and find the first version number right at the bottom and make a note of it.

The default behavior for subversion when adding files is to stop when it sees a directory it has already added. This can be a pain if you have added a file to a directory that is already added. You can force subversion to add any files you have not added by the following command.

svn add --force ./*

This will add the entire directory recursively even your config files so make sure you have set svn:ingore up correctly. I use a global ignore in the svn config to tell subversion to ignore config files because I support many web sites.