[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: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2003-11-17 16:45:40 CET

On Mon, 2003-11-17 at 09:38, Michael Klemm wrote:

> 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

Great! You never said that you cd'd into this directory... therefore I
assumed that you didn't. Your 1st and 2nd mails looked the same.

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

You need to be a lot more specific than that. Show us the output. Does
it print *nothing*? Or does it print "skip messages"?

Another thing I'd like to see is the exact output of the same merge
command, but with the '--dry-run' argument added.

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

There's no need for a '.' on the end there; diff has no working-copy
target. But that aside, sure, 'svn diff -rX:Y URL' will always work,
and it has nothing to do with the directory you're sitting in. It
doesn't even need a working copy at all.

It sounds like you're saying that when you compare two URLs via 'svn
diff', you see differences on your screen. But when you ask 'svn merge'
to compare the same two URLs, you see nothing at all?

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:46:42 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.