Re: Problems with merging two branches

On Mon, 2003-11-17 at 09:45, Ben Collins-Sussman wrote:

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

Oops, I misread your goal, sorry.

If you want to compare your working copy (which represents one URL) with
a different URL, you need to use a different syntax. 'svn diff -rX:Y
URL wc' doesn't do this, it's probably just ignoring the 'wc' argument.
You probably want to run 'svn diff -r7:9 --old . --new trunkURL'.

But that said, *why* do you want to compare the trunkURL with your
branch-working-copy at all? That's certainly not how merges work. I
have a suspicion that you're falling into the old trap: "to merge one
branch into another, I just compare the two branches, right?" The
answer is NO. Read this section of the svn book:

http://svnbook.red-bean.com/html-chunk/ch04s03.html#svn-ch4-sect-3.3

---------------------------------------------------------------------
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:55:16 2003