[prev in list] [next in list] [prev in thread] [next in thread] 

List:       subversion-issues
Subject:    [Issue 1276] New - log, diff disparity with branches
From:       issues () subversion ! tigris ! org
Date:       2003-04-30 14:58:05
[Download RAW message or body]

http://subversion.tigris.org/issues/show_bug.cgi?id=1276

*** Old
--- New
***************
*** 0 ****
--- 1,90 ----
+ +============================================================================+
+ | log, diff disparity with branches                                          |
+ +----------------------------------------------------------------------------+
+ |      Issue #: 1276                      Component: subversion              |
+ |       Status: NEW                         Version: current                 |
+ |   Resolution:                            Platform: Other                   |
+ |   Issue type: FEATURE                  OS/Version: Linux                   |
+ |     Priority: P3                     Subcomponent: unknown                 |
+ +----------------------------------------------------------------------------+
+ |  Assigned To: issues@subversion                                            |
+ |  Reported By: jgoerzen                                                     |
+ |   QA Contact: issues@subversion                                            |
+ |      CC list: Cc:                                                          |
+ +----------------------------------------------------------------------------+
+ |    Milestone: TargetMilestone: ---                                         |
+ |          URL:                                                              |
+ +============================================================================+
+ |                              DESCRIPTION                                   |
+ It's quite difficult to use the -r argument to diff (or many other commands) 
+ when dealing with branches.  The reason is this: if you want to compare 
+ your current file to its state as it was in the past, even though Subversion 
+ knows where it was, if the old revision predates the time it was svn cp'd to 
+ its current location, it complains about not being able to find the file. 
+  
+ Let me illustrate with an example. 
+  
+ I have this file (useless details snipped): 
+  
+ $ svn info MAGIC 
+ Path: MAGIC 
+ Name: MAGIC 
+ Url: http://svn.debian.org/svn/linux/linus/1.2.x/current/MAGIC 
+ Revision: 1791 
+ Node Kind: file 
+  
+ Now I run svn log on the thing: 
+  
+ $ svn log MAGIC 
+ ------------------------------------------------------------------------ 
+ rev 252:  jgoerzen | 1995-01-11 11:41:04 -0600 (Wed, 11 Jan 1995) | 2 
+ lines 
+  
+ Load linux-1.1.79 into linus/1.1.x/current. 
+  
+ ------------------------------------------------------------------------ 
+ rev 174:  jgoerzen | 1994-08-09 15:23:13 -0500 (Tue, 09 Aug 1994) | 2 
+ lines 
+  
+ Load linux-1.1.42 into linus/1.1.x/current. 
+  
+ ------------------------------------------------------------------------ 
+ rev 116:  jgoerzen | 1994-05-23 13:53:54 -0500 (Mon, 23 May 1994) | 2 
+ lines 
+  
+ Load linux-1.1.13 into linus/1.1.x/current. 
+  
+ ------------------------------------------------------------------------ 
+  
+ By way of explanation, since rev 252, there was a svn cp command that 
+ copied all of linus/1.1.x/current into linus/1.2.x/current.  That's why svn info 
+ shows MAGIC as being under 1.2.x/current. 
+  
+ Now let's say I want to see how MAGIC was before the last commit.  I try 
+ this: 
+  
+ $ svn diff -r 174 MAGIC 
+ svn: Filesystem has no item 
+ svn: REPORT request failed on '/svn/linux/linus/1.2.x/current' 
+ svn:  
+ file not found: revision `174', path `/linus/1.2.x/current' 
+  
+ That's true, but decidedly unhelpful.  It is true that linux/1.2.x didn't even 
+ exist at rev 174.  Yet svn log knows where the MAGIC in 1.2.x was at rev 
+ 174.  Moreover: 
+  
+ $ svn log -r 174 MAGIC 
+ svn: Filesystem has no item 
+ svn: REPORT request failed on '/svn/linux/linus/1.2.x/current/MAGIC' 
+ svn:  
+ file not found: revision `174', path `/linus/1.2.x/current/MAGIC' 
+  
+ Even though the "svn log MAGIC" output contained this exact revision, 
+ giving -r prevents it from being displayed. 
+  
+ Even worse, the "svn log MAGIC" output has no mention of the copy of its 
+ parent directory.  To find out where the file was at rev 174, someone would 
+ have to go up directory by directory running svn logs to find out where the 
+ copy occured. 
+  
+ So my request is: make -r smarter :-)
\ No newline at end of file

---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscribe@subversion.tigris.org
For additional commands, e-mail: issues-help@subversion.tigris.org

[prev in list] [next in list] [prev in thread] [next in thread]