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

2011-06-20 Thread Basile Starynkevitch
On Mon, 20 Jun 2011 20:14:15 +0200 Basile Starynkevitch wrote: > [...] > Sendinglibstdc++-v3/testsuite/30_threads/thread/swap > Sendinglibstdc++-v3/testsuite/ext/profile > Sendinglibstdc++-v3/testsuite/ext/rope/pthread7-rope.cc > Transmitting file > data >

svn issue when svnmerge merge-ing trunk into MELT

2011-06-20 Thread 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. SendingChangeLog SendingChangeLog.MELT Sendingconfig/ChangeLog Sending