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

Re: 4 bugs in svn diff (IssueZilla gives me Internal Server Error)

From: Philip Martin <philip_at_codematters.co.uk>
Date: 2002-04-29 01:29:27 CEST

Eric Gillespie <epg@pretzelnet.org> writes:

> Ben Collins-Sussman <sussman@collab.net> writes:
>
> > svn diff http://path/to/branch1 http://path/to/branch2
>
> That would be nice if it worked. I would expect that to work, as
> well as replacing the second path with a WC path. However, both
> actions produce the output i originally described in my bug report:
>
> > It lists every line in URL as being removed and every line in WCPATH
> > as being added, even though they only differ by one line. I suspect
> > this might have something to do with eol translation even though
> > i have not enabled it anywhere.

Well diff works as expected here

svn diff http://localhost:8888/repo/branch/ab http://localhost:8888/repo/branch/ac
Index: foo
===================================================================
--- foo
+++ tmp.25996.00001 Mon Apr 29 00:25:09 2002
@@ -1,3 +1,3 @@
 foo1
 foo2
-foob
+foo3

Just checking some basic stuff: the symptoms you describe will occur
if branch1 and branch2 don't have a common ancestor. It is not enough
that the directory trees have files with the same names, they have to
have been created via 'svn cp'. Without a common ancestor you get
something like

svn diff http://localhost:8888/repo/branch/ab http://localhost:8888/repo/branch/not_a_branch
Index: foo
===================================================================
--- foo
+++ tmp.1448.00001 Mon Apr 29 00:27:50 2002
@@ -1,3 +0,0 @@
-foo1
-foo2
-foob
Index: foo
===================================================================
--- foo
+++ tmp.26004.00001 Mon Apr 29 00:27:50 2002
@@ -0,0 +1,3 @@
+foo1
+foo2
+foo3

-- 
Philip
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Apr 29 01:30:28 2002

This is an archived mail posted to the Subversion Dev mailing list.