why is svn so useless at merge.
From: Robin Becker <robin_at_reportlab.com>
Date: 2005-03-02 13:11:04 CET
Client win32 1.1.2, server freeBSD 1.1.1.
I have a set of trunk changes which I wish to apply to a branch.
In the freshly checked out branch I do
svn merge -r15822:HEAD https://192.168.0.6/svn/private/trunk
The merge keeps failing with a Working copy users/xxx not locked.
I tried removing users from the branch and that fails dismally. It seems as
I also tried --ignore-ancestry, but still get the same error.
What can I do to get this simple merge to work?
Can the merge operation be decomposed in some way? Can I get merge to avoid this
SVN is really failing me here for the first time.
-- Robin Becker --------------------------------------------------------------------- To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org For additional commands, e-mail: users-help@subversion.tigris.orgReceived on Wed Mar 2 13:13:29 2005 |
This is an archived mail posted to the Subversion Users mailing list.
This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.