[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

svn merge --force fails with error "svn: Use --force to override this restriction"

From: Simon Yates \(SC\) <Yatessc_at_telkom.co.za>
Date: 2004-11-09 10:54:22 CET

Using svn version 1.1.1 (r11581), Windows client,
local repository accessed by file URLs

Attempting to merge a branch in which various new files have been
back into the trunk, fails if the working copy contains unversioned
copy of
one of the added files. Error message says use --force to override
restriction, but even with --force, fails with the same error:

C:\users\working>svn --force merge -r3:HEAD
UU bsmtvss\config\mailcfg.ini
UU bsmtvss\lib\caseclasses.php
svn: Use --force to override this restriction
svn: 'bsmtvss/lib/releaseclasses.php' is not under version control

bsmtvss/lib/releaseclasses.php is a file that was added in the branch,
does not exist in the trunk. C:\users\working is a working copy of
file://c:/tigris/repos/trunk with the exception that a local copy of
releaseclasses.php file had been left when I switched from the branch
to the
trunk due to uncommited changes (which I was prepared to lose with the

While the workaround is obviously fairly simple - either remove the
file or add it to the trunk - something is obviously wrong. Either
error message is incorrect, or the implmentation of --force for merge
not catering for this.

Simon Yates

This e-mail and its contents are subject to the Telkom SA Limited
e-mail legal notice available at

To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Nov 9 19:23:34 2004

This is an archived mail posted to the Subversion Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.