svn issue when svnmerge merge-ing trunk into MELT

svn issue when svnmerge merge-ing trunk into MELT

[Basile Starynkevitch]

Hello,

I am trying to merge the trunk into MELT branch. I am using the
svnmerge merge command (svnmerge is a standard Python script). But I am
getting: % svn commit
Waiting for Emacs...
Sending        .
Sending        ChangeLog
Sending        ChangeLog.MELT
Sending        config/ChangeLog
Sending        config/mh-darwin
Sending        configure
Sending        configure.ac
Sending        gcc/ChangeLog
Sending        gcc/DATESTAMP
Sending        gcc/Makefile.in
[...]
Adding         gcc/common/config/alpha
Adding         gcc/common/config/alpha/alpha-common.c
[...]
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'


Usually, I manage to handle that by ./contrib/gcc_update-ing and then
reissuing the svnmerge command. But here it failed three times.

svnmerge is from the subversion-tools ; on Debian/Sid I have
+++-==============-==============-============================================
ii  subversion     1.6.17dfsg-1   Advanced version control system
ii  subversion-too 1.6.17dfsg-1   Assorted tools related to Subversion

Do you have any advice on dealing with that? Or explanations?

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} ***

Re: svn issue when svnmerge merge-ing trunk into MELT

[Basile Starynkevitch]

On Mon, 20 Jun 2011 20:14:15 +0200
Basile Starynkevitch <basile@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} ***