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

Re: svn diff issue

From: Hari Kodungallur <hkodungallur_at_gmail.com>
Date: 2005-05-21 04:36:25 CEST

Hi Ben,

I have attached some of the output to the end of this email.
File in /vendors/.... directory is a vendor drop. File in /trunk/...
is copied form the /vendor drop. In this example, I checkout
/trunk/.... Change one file. I do a "svn diff" it shows the change.
This particular file has not changed from vendors to trunk. So a diff
between the vendor URL and the trunk URL is empty. A diff between WC
and trunk URL shows the diff. But when I do a diff between WC and
vendor URL it shows nothing (unless I specify --notice-ancestry)

One additional note from some experimenting today is that, if I
check-in the changes to this file to the trunk, then this problem
vanishes. Next time I make a change on the same file, the diff between
vendor URL and WC works just fine.

Thanks
-Hari

On 5/20/05, Ben Collins-Sussman <sussman@collab.net> wrote:
>
> On May 20, 2005, at 12:22 AM, Hari Kodungallur wrote:
>
> > Hi Ben,
> >
> > Yes, I have. What puzzles me (may be something that I don't understand
> > here) is that in my case the diff actually does it work only when the
> > --notice-ancestry argument is provided. And it is showing *only* the
> > change that I made. Even if there was some ancestry issues with the
> > file, diff should have given a whole bunch of deleted lines and a
> > whole bunch of added lines when --notice-ancestry is given. The diff
> > command, from what I understood, does not care about the ancestry. So,
> > I expected a normal functioning of diff without the --notice-ancestry.
> >
> > In other words, I am not able think of a situation where the diff
> > would work as I expected (that is show only the changes that I have
> > made) only when --notice-ancestry option is provided.
>
>
> Hm, maybe you can give more details about the history of the data
> you're comparing, and more details about exactly what you're seeing.
> Can you paste some examples?
>
>

================== CONSOLE OUTPUT ===============

[/usr/home/svntest/libredcarpet-src] > svn info
Path: .
URL: svn+ssh://subversion/opt/svn-root/trunk/corestack/oss/comp/install/redcarpet/libredcarpet/src/src
Repository UUID: 3bdf6853-72f0-0310-9d5d-f9e1b17f9bb1
Revision: 19862
Node Kind: directory
Schedule: normal
Last Changed Author: <user deleted>
Last Changed Rev: 19833
Last Changed Date: 2005-05-20 16:55:42 -0700 (Fri, 20 May 2005)
 
[/usr/home/svntest/libredcarpet-src] > svn diff rc-extract-packages.c
Index: rc-extract-packages.c
===================================================================
--- rc-extract-packages.c (revision 19862)
+++ rc-extract-packages.c (working copy)
@@ -1022,3 +1022,5 @@
  
     return info.count;
 }
+
+/* my comments */

[/usr/home/svntest/libredcarpet-src] > svn diff
--old=svn+ssh://subversion/opt/svn-root/trunk/corestack/oss/comp/install/redcarpet/libredcarpet/src/src/rc-extract-packages.c
--new=rc-extract-packages.c
Index: rc-extract-packages.c
===================================================================
--- rc-extract-packages.c
(.../svn+ssh://subversion/opt/svn-root/trunk/corestack/oss/comp/install/redcarpet/libredcarpet/src/src/rc-extract-packages.c)
   (revision 19862)
+++ rc-extract-packages.c (.../rc-extract-packages.c) (working copy)
@@ -1022,3 +1022,5 @@
  
     return info.count;
 }
+
+/* my comments */

[/usr/home/svntest/libredcarpet-src] > svn diff
--old=svn+ssh://subversion/opt/svn-root/vendors/libredcarpet/libredcarpet-2_4_5/src/rc-extract-packages.c
--new=rc-extract-packages.c

[/usr/home/svntest/libredcarpet-src] > svn diff
--old=svn+ssh://subversion/opt/svn-root/vendors/libredcarpet/libredcarpet-2_4_5/src/rc-extract-packages.c
--new=rc-extract-packages.c --notice-ancestry
Index: rc-extract-packages.c
===================================================================
--- rc-extract-packages.c
(.../svn+ssh://subversion/opt/svn-root/vendors/libredcarpet/libredcarpet-2_4_5/src/rc-extract-packages.c)
      (revision 19866)
+++ rc-extract-packages.c (.../rc-extract-packages.c) (working copy)
@@ -1022,3 +1022,5 @@
  
     return info.count;
 }
+
+/* my comments */

[/usr/home/svntest/libredcarpet-src] > svn diff
--old=svn+ssh://subversion/opt/svn-root/vendors/libredcarpet/libredcarpet-2_4_5/src/rc-extract-packages.c
--new=svn+ssh://subversion/opt/svn-root/trunk/corestack/oss/comp/install/redcarpet/libredcarpet/src/src/rc-extract-packages.c

[/usr/home/svntest/libredcarpet-src] > svn log
svn+ssh://subversion/opt/svn-root/vendors/libredcarpet/libredcarpet-2_4_5/src/rc-extract-packages.c
------------------------------------------------------------------------
r12767 | <user> | 2005-02-24 18:39:47 -0800 (Thu, 24 Feb 2005) | 1 line
 
moved vendor tag for libredcarpet from 2_4_5 to libredcarpet-2_4_5
------------------------------------------------------------------------
r12476 | <user> | 2005-02-19 23:40:31 -0800 (Sat, 19 Feb 2005) | 1 line
 
Correcting the naming format
------------------------------------------------------------------------
r12475 | <user> | 2005-02-19 23:37:04 -0800 (Sat, 19 Feb 2005) | 2 lines
 
Tag vendors/libredcarpet/current as vendors/libredcarpet/2.4.5.
 
------------------------------------------------------------------------
r12474 | <user> | 2005-02-19 23:36:48 -0800 (Sat, 19 Feb 2005) | 3 lines
 
Load /home/<user>/redcarpet/tars/libredcarpet-2.4.5 into
vendors/libredcarpet/current.
 
------------------------------------------------------------------------
r12399 | <user> | 2005-02-19 08:22:12 -0800 (Sat, 19 Feb 2005) | 1 line
 
current tag -- libredcarpet 2.2.1
------------------------------------------------------------------------
r4183 | <user> | 2004-07-15 11:29:38 -0700 (Thu, 15 Jul 2004) | 2 lines
 
This commit was manufactured by cvs2svn to create tag
'libredcarpet-2_2_1'.
------------------------------------------------------------------------
r1464 | <user> | 2004-03-09 14:57:49 -0800 (Tue, 09 Mar 2004) | 1 line
 
This commit was manufactured by cvs2svn to create branch 'Ximian'.
------------------------------------------------------------------------
r1463 | <user> | 2004-03-09 14:57:47 -0800 (Tue, 09 Mar 2004) | 2 lines
 
Initial revision
 
------------------------------------------------------------------------

[/usr/home/svntest/libredcarpet-src] > svn log
svn+ssh://subversion/opt/svn-root/trunk/corestack/oss/comp/install/redcarpet/libredcarpet/src/src/rc-extract-packages.c
logname: no login name
------------------------------------------------------------------------
r13971 | <user> | 2005-03-15 22:48:24 -0800 (Tue, 15 Mar 2005) | 1 line
 
Bug fix 2036 - part 1
------------------------------------------------------------------------
r12477 | <user> | 2005-02-20 01:24:19 -0800 (Sun, 20 Feb 2005) | 1 line
 
Imported Libredcarpet 2.4.5 and resolved conflicts
------------------------------------------------------------------------
r1463 | <user> | 2004-03-09 14:57:47 -0800 (Tue, 09 Mar 2004) | 2 lines
 
Initial revision
 
------------------------------------------------------------------------

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sat May 21 04:37:55 2005

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