[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Svn diff and merge don't seem to work for me.

From: Hari Kodungallur <hkodungallur_at_gmail.com>
Date: 2005-10-21 23:01:45 CEST

On 10/21/05, Jim Lynch <jimlynch1@gmail.com> wrote:
> I have two branches by different names. On is revision 15 and the other is
> revision 12. There are hundreds of lines of differences however this diff
> command comes up empty.
> svn diff -r 12:15
> Even diff -r HEAD:12 should produce lots of differences, but it doesn't.
> Can someone explain what I'm doing wrong?
> Thanks,
> Jim.

If you want to see a difference between two branches, do "svn diff
--old=branch1URL --new=branch2URL".
Or if you want to have a diff of branch1 @ rev 12 and branch2 @ rev
15, then do "svn diff -r 12:15 --old=branch1URL --new=branch2URL"

If you just say "svn diff -r ver1:ver2", then it will do a diff on the
branch (or turnk) your working copy is made of.

-Hari Kodungallur
SpikeSource Inc.
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Oct 21 23:04:29 2005

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.