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

Re: why is svn so useless at merge.

From: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2005-03-02 15:03:46 CET

On Mar 2, 2005, at 6:11 AM, Robin Becker wrote:

> 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

Should this set of changes apply 'cleanly' to the branch? In other
words, is r15822 the revision in which the branch was born?

> 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 though the merge is faili to create folders which it needs to
> inspect/change.

"Removing users from the branch"? I don't understand.

Can you please show us detailed transcripts of the command and output.
And give more information on the history here.

To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Mar 2 15:06:41 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.