To update a config file:
$ cp old.conf updated.conf $ merge -A updated.conf new.conf old.conf
Then edit updated.conf and resolve merge conflicts then deploy updated.conf.
To update a config file:
$ cp old.conf updated.conf $ merge -A updated.conf new.conf old.conf
Then edit updated.conf and resolve merge conflicts then deploy updated.conf.
Thanks to this handy document How To Set Cron to Run Every 5 Minutes I now my crontab configured so that my jj5-test repo gets updated every five minutes. It’s the sort of thing I generally do in a post-commit hook, but in this case that won’t work owing to the way the servers are configured (the files are in my account and not owned by the www-data user the commit-hook runs as).
So to configure cron I issued the command:
$ crontab -e
And then to update my svn working copy:
# m h dom mon dow command */5 * * * * cd /home/jj5/web/test && svn update > /dev/null