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

Advice Needed: Merging Branch back into Trunk

From: Richard In Public <edification_at_blueyonder.co.uk>
Date: 2003-04-01 20:23:35 CEST

Hi

I'm trying to merge a branch into the trunk but do not understand the
results. I've not been able to figure it out using the Subversion guide or
mailing lists.

What I'm trying is the following:

1. Create a new directory into which I checkout .../branches/mybranch
2. Merge the branch into this wc, thus (executed within the new directory):

     svn merge http://myserver/svn/myrepos/trunk
http://myserver/svn/myrepos/branches/mybranch .
3. Commit this directory.

This appears to work ok and an visual (browser) inspection of the repository
seems to show success. However, if I repeat this process (in a new
directory) I get:

D images/BrownBox.jpg
D images/BrownBox.jpg
A images/BrownBox.jpg
D images/buy-now.jpg
D images/buy-now.jpg
A images/buy-now.jpg
D images/Logo.jpg
D images/Logo.jpg
A images/Logo.jpg
D images/suppliers/heav.jpg
D images/suppliers/heav.jpg
A images/suppliers/heav.jpg
D images/suppliers/caco.jpg
D images/suppliers/caco.jpg
A images/suppliers/caco.jpg
D images/suppliers/gift.jpg
D images/suppliers/gift.jpg
A images/suppliers/gift.jpg
D images/suppliers/shsm.jpg
D images/suppliers/shsm.jpg
A images/suppliers/shsm.jpg
D images/suppliers/deil.jpg
D images/suppliers/deil.jpg
A images/suppliers/deil.jpg
D images/CalypsoProduct.jpg
D images/CalypsoProduct.jpg
A images/CalypsoProduct.jpg
C images/products/ficc/products/002.jpg
D images/products/ficc/products/L002.jpg
D images/products/ficc/products/L002.jpg
A images/products/ficc/products/L002.jpg
D images/products/caco/products/caco001.jpg
D images/products/caco/products/caco001.jpg
A images/products/caco/products/caco001.jpg
D images/products/eopr/products/024.jpg
D images/products/eopr/products/024.jpg
A images/products/eopr/products/024.jpg
D images/products/eopr/products/025.jpg
D images/products/eopr/products/025.jpg
A images/products/eopr/products/025.jpg
D images/products/eopr/products/L024.jpg
D images/products/eopr/products/L024.jpg
A images/products/eopr/products/L024.jpg
D images/products/eopr/products/L025.jpg
D images/products/eopr/products/L025.jpg
A images/products/eopr/products/L025.jpg
D images/products/eopr/products/Eo001.jpg
D images/products/eopr/products/Eo001.jpg
A images/products/eopr/products/Eo001.jpg
D images/products/eopr/products/Eo002.jpg
D images/products/eopr/products/Eo002.jpg
A images/products/eopr/products/Eo002.jpg
D images/products/eopr/products/Closer.jpg
D images/products/eopr/products/Closer.jpg
A images/products/eopr/products/Closer.jpg
D images/products/inwi/products
D images/products/inwi/products
svn: Unmergeable scheduling requested on an entry
svn: Can not add 'images/products/inwi/products/products' to a parent
directory scheduled for deletion

1. Am I going about this the wrong way?
2. How do I get my trunk to precisely mirror a branch?
3. Is there a way to force merge to always overwrite local copies?

TIA,

Richard Hoberman

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Apr 1 20:24:22 2003

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