[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: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2002-04-29 01:16:30 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.

I'm not sure how to reproduce this problem. I mean, it seems to work
fine against the main svn repository. I see exactly what I would
expect to see in my example (below).

I appreciate you finding this bug, though; can you diagnose the
problem further? Maybe try checking out the two URLs (or checking out
the two parent URLs) and then doing a byte-for-byte hex comparison of
the two?

My example:

[sussman_at_kepler:~/projects/svn]$ svn diff http://svn.collab.net/repos/svn/trunk/CHANGES http://svn.collab.net/repos/svn/branches/0.11.1/CHANGES
Index: CHANGES
===================================================================
--- CHANGES
+++ tmp.268.00001 Sun Apr 28 18:13:51 2002
@@ -1,20 +1,3 @@
-Version X.X.X (unreleased)
-
- User-visible changes:
- * 'svn diff' can now compare two arbitrary URLs (issue 674)
- * 'svn diff' now displays property changes
- * 'svn rm' requires --force for unversioned and/or modified items
- * 'svn rm' immediately removes files & uncommitted dirs
- * 'svn mv' for WC->WC behaves like 'svn rm' with respect to the source
- * checkouts, updates, switches now print received revision on final line.
- * new 'svn info' command prints information about a versioned resource.
-
- Developer-visible changes:
- * updates can deal with disjoint urls.
- * python tests now run on Win32.
- * svn_cl__diff/svn_client_diff gutted and rewritten
- * NEW internalized diff/diff3 library. Not yet integrated/tested.
-
 Version 0.11.1 (released 12 April 2002, revision 1682)
 
  User-visible changes:

---------------------------------------------------------------------
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:19:38 2002

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