To resolve this kind of conflict on a working copy:
svn: E155015: Échec de la propagation (commit), détails :
svn: E155015: Arrêt de la propagation : '/var/www/prj/wp-content/cache' demeure en conflit
To do this:
svn resolve --accept=working /var/www/prj/wp-content/cache
For an entire directory (accept all)
svn resolve --accept=working --depth infinity
In fact, RabbitVcs is very easy to install... Except when there's a problem, and then... one can search for a long time 😟Here's how to resolve most installation issues on Ubuntu 14.04LTS.1 – Add the sourcesudo add-apt-repository ppa:rabbitvcs/ppa or add the source to your /etc/apt/sources.list filedeb http://ppa.launchpad.net/rabbitvcs/ppa/ubuntu trusty main2 – Install the packages
sudo apt-get update
sudo apt-get install rabbitvcs-cli rabbitvcs-core rabbitvcs-gedit rabbitvcs-nautilus3
3 – M...
To recursively remove all svn management files (.svn) from a working copy, simply navigate to the root directory of your working copy and execute the following command:
find . -name ".svn" -exec rm -rf {} \;
Another solution is to create an alias in your ~/.bashrc and then execute the command when needed:
alias rmsvn='find . -name ".svn" -exec rm -rf {} \;'
To add files recursively from the command line with svn, we have several possibilities.The first one, probably the cleanest:
svn add --force * --auto-props --parents --depth infinity -q
Although only the following options seem really necessary:
svn add --force *
Then there are alternative solutions a bit more complicated to understand:
svn status | grep '?' | sed 's/^.* /svn add /' | bash
svn add `svn status .|grep "^?"|awk '{print $2}'`
svn st | grep "^\?" | awk "{print \$2}" | xargs svn...