Re: Problems with merging two branches

Hi,

thanks for your answer!

Ben Collins-Sussman wrote:
> On Mon, 2003-11-17 at 07:38, Michael Klemm wrote:
>
>
>>svn merge -r 7:9
>>svn+ssh://faui24x/proj.stand/faui24x/i2manta/subversion/Manta/trunk/Manta/
>>manta/compiler/lasm/
>
>
> 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
svn+ssh://faui24x/proj.stand/faui24x/i2manta/subversion/Manta/trunk/Manta/manta/compiler/lasm
.

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

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

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

Regards
        -michael

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