automatically resolve (some) tree conflicts

2012-08-20 Thread Michael Hüttermann
Hello, nailing down some tree conflicts show that there are no differences at all comparing merged versions. One example is a file that has the same name, path and content, but was removed/added meanwhile, and Subversion lost the tracking that it is exactly the same file than before. Is there a to

automatically resolve (some) tree conflicts

2012-08-20 Thread Michael Hüttermann
Hello, nailing down some tree conflicts show that there are no differences at all comparing merged versions. One example is a file that has the same name, path and content, but was removed/added meanwhile, and Subversion lost the tracking that it is exactly the same file than before. Is there a to

Re: automatically resolve (some) tree conflicts

2012-08-20 Thread Stefan Sperling
On Mon, Aug 20, 2012 at 12:14:06PM +0200, Michael Hüttermann wrote: > Hello, > > nailing down some tree conflicts show that there are no differences at all > comparing merged versions. One example is a file that has the same name, > path and content, but was removed/added meanwhile, and Subversion

Re: AW: Corrupt .svn directory using Subversion 1.7

2012-08-20 Thread Philip Martin
Steven Lee writes: > On Aug 19, 2012 11:45 PM, "Steven Lee" wrote: >> >> Yes, I tried "svn update --set-depth infinity" and nothing happened. > Many of the files are still missing from my working copy. It does seem > like that should have worked. >> > > Just to be clear, I tried "svn update --s

Re: AW: Corrupt .svn directory using Subversion 1.7

2012-08-20 Thread Johan Corveleyn
On Mon, Aug 20, 2012 at 1:21 PM, Philip Martin wrote: > Steven Lee writes: > >> On Aug 19, 2012 11:45 PM, "Steven Lee" wrote: >>> >>> Yes, I tried "svn update --set-depth infinity" and nothing happened. >> Many of the files are still missing from my working copy. It does seem >> like that shoul

svnsync fails on a 'pull' operation

2012-08-20 Thread Tony Butt
We synchronise our production repository to a backup server, using a push model from post-commit and post-revprop hooks, and also a pull model (from the backup server) to a different synchronised copy as an hourly cron job. We also make a nightly hotcopy of the repository which is backed up to