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

Re: Problems with merging two branches

From: Michael Klemm <mail_at_michael-klemm.net>
Date: 2003-11-17 15:58:10 CET


thanks for your answer!

Ben Collins-Sussman wrote:
> On Mon, 2003-11-17 at 07:38, Michael Klemm wrote:
>>svn merge -r 7:9
> So you're comparing two versions of the 'lasm' directory on trunk,
> right? That means the resulting patch is all going to be relative to
> that 'lasm' directory, which means you want the target of your merge to
> be the *same* directory in your branch-working-copy.
> $ cd $HOME/Manta/manta/compiler/lasm
> $ svn merge -r 7:9 URL-to-trunk-lasm-directory .

OK. I did that. Again, running svn diff using

svn diff -r 7:9

produces a lot of traffic on my terminal. After that, running svn merge
by issuing

svn merge -r 7:9

does not update of my branch at all. Wired! :-)


To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Mon Nov 17 15:59:32 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.