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

Problem with merging a whole branch

From: Michael Klemm <michael.klemm_at_informatik.uni-erlangen.de>
Date: 2004-03-05 15:04:46 CET

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Hi,

using Subversion 1.0.0 on SuSE 8.2, we have a problem when merging two
branches. The first branch is checked out by:

$ REPOS=svn+ssh://faui24x/proj.stand/faui24x/i2manta/subversion/Manta
$ svn co $REPOS/branches/Dynamic_Loop_Repartitioning/Manta/

Then I do a

$ svn merge -r222:HEAD $REPOS/branches/main/Manta ./Manta

After a while of updating, adding and deleting files and directories,
the following happens:

- ----------------- begin ---------------
D Manta/manta/javalibs/java/awt/image/MemoryImageSource.java
D Manta/manta/javalibs/java/awt/image/ImageConsumer.java
D Manta/manta/javalibs/java/awt/image
D Manta/manta/javalibs/java/awt/image
svn: URL
'svn+ssh://faui24x/proj.stand/faui24x/i2manta/subversion/Manta/branches/main/Manta/manta/javalibs/java/awt/image'
doesn't match existing URL
'svn+ssh://faui24x/proj.stand/faui24x/i2manta/subversion/Manta/branches/Dynamic_Loop_Repartitioning/Manta/manta/javalibs/java/awt/image'
in 'Manta/manta/javalibs/java/awt/image'
- ------------------ end ---------------

It looks like Subversion tries to delete the directory
Manta/manta/javalibs/java/awt/image twice...

Is there a way to correct the above error?

Best regards
        -michael

- --
Computer Science Department 2, University of Erlangen-Nuremberg
Martensstrasse 3, D-91058 Erlangen, Germany
phone: ++49 (0)9131 85-28995, fax: ++49 (0)9131 85-28809
web: http://www2.informatik.uni-erlangen.de/~klemm
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.2-rc1-SuSE (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFASIj+WEu1syWqdn0RAjBAAJwPIjQRmw75ZH3TztJQy6pz0sG94QCgyP8J
v0Z238L5bm+BoM90Anyj29Q=
=NxAF
-----END PGP SIGNATURE-----

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Mar 5 15:05:18 2004

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