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

Re: Diff between BASE and PREV header problem

From: <kfogel_at_collab.net>
Date: 2004-09-01 16:43:42 CEST

Bram Senders <bram@luon.net> writes:
> Hi all,
>
> I've got a little problem when doing a diff between the BASE and PREV
> revisions of a repository. When I do a diff from PREV to BASE, the diff
> header correctly shows that this is a diff from PREV (revision 7) to
> BASE (working copy):
>
> $ svn diff -rPREV:BASE myfile|head -n4
> Index: myfile
> ===================================================================
> --- myfile (revision 7)
> +++ myfile (working copy)
>
> Yet when I diff from BASE to PREV, the diff header shows incorrectly
> that is is a diff from revision 7 to the working copy, while it is
> actually the other way around:
>
> $ svn diff -rBASE:PREV myfile|head -n4
> Index: myfile
> ===================================================================
> --- myfile (revision 7)
> +++ myfile (working copy)
>
> Here, I think "revision 7" should be "working copy" and the other way
> around. The actual contents of the diff do confirm to the given
> parameters. Diffs with other parameters also work correctly. This is
> using Subversion 1.0.6.
>
> Does anyone know whether this is a real bug, or something that I did
> wrong? Any help is appreciated.

Indeed, I think you have found a bug, thanks! It reproduces for me
too. I will file an issue and debug this:

   $ svn status -v README
               10793 10383 kfogel README
   $ svn info README
   Path: README
   Name: README
   URL: http://svn.collab.net/repos/svn/trunk/README
   Repository UUID: 65390229-12b7-0310-b90b-f21a5aa7ec8e
   Revision: 10793
   Node Kind: file
   Schedule: normal
   Last Changed Author: kfogel
   Last Changed Rev: 10383
   Last Changed Date: 2004-07-21 21:53:27 -0500 (Wed, 21 Jul 2004)
   Text Last Updated: 2004-07-23 12:19:40 -0500 (Fri, 23 Jul 2004)
   Properties Last Updated: 2004-07-23 12:19:38 -0500 (Fri, 23 Jul 2004)
   Checksum: c7c60a777bad87a1ae4bc1c7e8313a37
   
   $ svn diff -rPREV:BASE README
   Index: README
   ===================================================================
   --- README (revision 10382)
   +++ README (working copy)
   @@ -146,8 +146,8 @@
    
         Please note that the cvs2svn project is a *separate* project from
         Subversion. If you have problems with cvs2svn or are confused,
   - please email cvs2svn project's mailing lists, not the Subversion
   - lists.
   + please email the cvs2svn project's mailing lists, not the
   + Subversion lists.
    
         Finally, be sure to see Appendix A in the Subversion book. It
         contains a very quick overview of the major differences between
   $ svn diff -rBASE:PREV README
   Index: README
   ===================================================================
   --- README (revision 10382)
   +++ README (working copy)
   @@ -146,8 +146,8 @@
    
         Please note that the cvs2svn project is a *separate* project from
         Subversion. If you have problems with cvs2svn or are confused,
   - please email the cvs2svn project's mailing lists, not the
   - Subversion lists.
   + please email cvs2svn project's mailing lists, not the Subversion
   + lists.
    
         Finally, be sure to see Appendix A in the Subversion book. It
         contains a very quick overview of the major differences between

(Note to bystanders: that the diffs here look exactly the same if you
just glance carelessly at them, but they are in fact different.)

-Karl

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Sep 1 18:25:37 2004

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