Problems with merging two branches

[Michael Klemm <mi...@gmxpro.de>]

Hi there!

We got two branches in our project: trunk/Manta and branches/DFS/Manta

I checked out branches/DFS/Manta using

svn co $PATH_TO_REP/branches/Manta getting a directory $HOME/Manta.

Issuing a

svn diff -r 7:9
svn+ssh://faui24x/proj.stand/faui24x/i2manta/subversion/Manta/trunk/Manta/
manta/compiler/lasm/ ,

I get a whole bunch of changes made by me and my collegue which made his
changes to trunk/Manta.

Now I need to include his changes into my version of the project. Thus,
I issued

svn merge -r 7:9
svn+ssh://faui24x/proj.stand/faui24x/i2manta/subversion/Manta/trunk/Manta/
manta/compiler/lasm/ ,

but there was no merge applied to my local copy of my branch. Using
usage 1 of svn merge threw away all my changes and switched over to
trunk/Manta.

Am I completely stupid or is there something deeply wrong?


Regards
	-michael


---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org