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

Problems with merging two branches

From: Michael Klemm <michael.klemm_at_gmxpro.de>
Date: 2003-11-17 14:25:56 CET

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

Am I completely stupid or is there something deeply wrong?


To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Mon Nov 17 16:01:57 2003

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.