Re: Problems with merging two branches

Ben Collins-Sussman wrote:
> On Mon, 2003-11-17 at 08:58, Michael Klemm wrote:
>
>
>>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! :-)
>
>
> I think you're not understanding me.
>
> You first mail said, "I ran command A, and it didn't do anything."
> I replied and said, "That's because you should be running command B."
> Then you replied and said, "OK, I run command A, and still doesn't do
> anything."
>
> I'm not sure what to say here. :-)

OK. Let's do it slowly, so I understand right this time :-).

I need to tell svn merge which paths it should merge together to create
the patched version of my source. To do so, I cd into my private working
copy of my branch. That is a

$ cd $HOME/Manta/manta/compiler/lasm

Then, I tell svn to merge the changes made in the trunk into my working
copy. I'll issue:

$ svn merge -r 7:9 URL-to-trunk-lasm .

That's what you told me to do. I did that and it didn't do what it
should. Now, if I just want to see the diffs between the trunk 'lasm'
and my working copy 'lasm', I'll do a

$ $HOME/Manta/manta/compiler/lasm
$ svn diff -r 7:9 URL-to-trunk-lasm .

I'll again see all changes made in the trunk version of the 'lasm' dir.
Is that correct? Or am I mislead?

Confused :-)
        -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 16:39:26 2003