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
created
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
the
restriction, but even with --force, fails with the same error:
C:\users\working>svn --force merge -r3:HEAD
file:///c:/tigris/repos/branches/DeliveryBuild
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,
hence
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
the
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
--force).
While the workaround is obviously fairly simple - either remove the
local
file or add it to the trunk - something is obviously wrong. Either
the
error message is incorrect, or the implmentation of --force for merge
is
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
http://www.telkom.co.za/TelkomEMailLegalNotice.PDF
---------------------------------------------------------------------
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