On Mon, 20 Jun 2011 20:14:15 +0200
Basile Starynkevitch <bas...@starynkevitch.net> wrote:
> [...]
> Sending        libstdc++-v3/testsuite/30_threads/thread/swap
> Sending        libstdc++-v3/testsuite/ext/profile
> Sending        libstdc++-v3/testsuite/ext/rope/pthread7-rope.cc
> Transmitting file
> data 
> ..................................................................................................................................................svn:
> Commit failed (details follow): svn: File already exists: filesystem
> '/svn/gcc/db', transaction '175226-py9', path
> '/branches/melt-branch/gcc/common/common-target-def.h' svn: Your commit
> message was left in a temporary file: svn:
> '/usr/src/Lang/basile-melt-gcc/svn-commit.tmp'
> 

By checking out from scratch the MELT branch, and running svnmerge
merge again, I was able to do that merge.

Regards

-- 
Basile STARYNKEVITCH         http://starynkevitch.net/Basile/
email: basile<at>starynkevitch<dot>net mobile: +33 6 8501 2359
8, rue de la Faiencerie, 92340 Bourg La Reine, France
*** opinions {are only mine, sont seulement les miennes} ***

Reply via email to