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

Re: Merge command failed with "missing or not locked"

From: Garrett Rooney <rooneg_at_electricjellyfish.net>
Date: 2006-02-14 23:32:08 CET

On 12/19/05, Bob Peterson <bob@memento-inc.com> wrote:
> I just guessing here, without trying it in a dummy repository...
>
> svn mkdir http://<repository>/src/trunk/Problem
> <populate Problem folder>
> <make changes in trunk>
> svn mkdir http://<repository>/src/branches/oak
> # Branch only the top level folders which I need:
> svn copy http://<repository>/src/trunk/A
> http://<repository>/src/branches/oak
> svn copy http://<repository>/src/trunk/B
> http://<repository>/src/branches/oak
> svn copy http://<repository>/src/trunk/C
> http://<repository>/src/branches/oak
> <make changes in branch/oak, merge back to trunk>
> <repository is now at revision N>
> <make changes in trunk>
> cd oak
> svn merge -r <N>:HEAD http://<repository>/src/trunk

FWIW, I just tried this (the email's been sitting in my "should look
at this" folder for a while) with the current trunk version of SVN and
it does in fact skip those subdirectories. I suspect, although I
haven't tried it, that you'd also see it skip those subdirs in 1.3.x.
What version specifically did you see the problem in?

-garrett

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Feb 14 23:33:08 2006

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