Re: Problems with merging two branches

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 .

Or, instead of cd'ing in, you could just run

$ svn merge -r 7:9 URL-to-trunk-lasm-directory Manta/manta/compiler/lasm

---------------------------------------------------------------------
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:39:28 2003