Re: Problem with branch and merge

 --- Jacob Atzen <jacob@aub.dk> wrote:
> You could "undo changes" in your trunk.

This doesn't work either. I tried the procedure
described by Peter i.e.:

svn co file:///xy/trunk merge
cd merge
svn merge -r HEAD:140 file:///xy/trunk .
svn merge -r 150:HEAD file:///xy/branches/2004-12-22 .

and it yields a strange error:
svn: URL
'file:///xy/branches/2004-12-22/code/src/SP/Libraries/DOBs'
doesn't match existing URL
'file:///xy/trunk/code/src/SP/Libraries/DOBs' in
'code/src/SP/Libraries/DOBs'

where 'code/src/SP/Libraries/DOBs' is a directory that
exists in both HEAD and 149 but *not* in 140.

> Or you could simply delete trunk and rename/move
> your branch and call it trunk.

This works perfectly!

Thank you very much indeed!

Cheers,
Andy

        
        
                
___________________________________________________________
ALL-NEW Yahoo! Messenger - all new features - even more fun! http://uk.messenger.yahoo.com

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Jan 19 15:41:18 2005