You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Stephen Clouse <st...@theiqgroup.com> on 2003/11/14 02:09:11 UTC

`svn diff` showing changes that aren't there?

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

We're running 0.32.1, and we've been experiencing this very interesting bug in 
our repository at random.  After we change a file, `svn diff` will report some 
additional spurious "changes" at a later point in the file, even though the 
lines in question haven't been touched.

First off, this is the actual one-line change.  This is a diff between my 
working copy and an `svn cat` of the current repository revision.

- --- Edit.pm.last        2003-11-13 19:38:24.000000000 -0600
+++ Edit.pm     2003-11-13 19:31:53.000000000 -0600
@@ -2652,7 +2652,7 @@
 use warnings;
 use strict;
 use Carp;
- -use IQGroup::Core::Utility qw(numerify commify clockify);
+use IQGroup::Core::Utility qw(numerify commify clockify abbreviate);
 use IQGroup::IQCoordinator::Core::Utility qw(fqdbcn fqmcn);

 our @ISA = qw(IQGroup::IQCoordinator::Core::BaseModule::TabEdit::SubTab);

Now here's what `svn diff` outputs:

Index: Edit.pm
===================================================================
- --- Edit.pm     (revision 3343)
+++ Edit.pm     (working copy)
@@ -2652,7 +2652,7 @@
 use warnings;
 use strict;
 use Carp;
- -use IQGroup::Core::Utility qw(numerify commify clockify);
+use IQGroup::Core::Utility qw(numerify commify clockify abbreviate);
 use IQGroup::IQCoordinator::Core::Utility qw(fqdbcn fqmcn);

 our @ISA = qw(IQGroup::IQCoordinator::Core::BaseModule::TabEdit::SubTab);
@@ -4215,7 +4215,7 @@
                                my $user_label_2 = ($rec->findnodes('user_label_2'))[0]->getChildNodes->item(0)->getNodeValue;

                                my $orig_unit_list = ($rec->findnodes('list_price'))[0]->getChildNodes->item(0)->getNodeValue;
- -                               my $orig_unit_sell = ($rec->findnodes('sell_price'))[0]->getChildNodes->item(0)->getNodeValue;
+                               my $orig_unit_sell = ($rec->findnodes('sell_price'))[0]->getChildNodes->item(0)->getNodeValue;
                                my $orig_unit_cost = ($rec->findnodes('cost_price'))[0]->getChildNodes->item(0)->getNodeValue;
                                $orig_unit_sell = ($rec->findnodes('sell_discount'))[0]->getChildNodes->item(0)->getNodeValue if !$orig_unit_sell;
                                $orig_unit_cost = ($rec->findnodes('cost_discount'))[0]->getChildNodes->item(0)->getNodeValue if !$orig_unit_cost;
@@ -8393,7 +8393,7 @@
                                my $has_items = 0;
                                my $remove_type = $r->param('delete_order_stage_service_type_id_' . $item_type->id);

- -                               my $st2 = $subobj->GetServices;
+                               my $st2 = $subobj->GetServices;
                                while (my $item = $st2->fetch) {
                                        next unless $item->order_service_type_id == $item_type->order_service_type_id;
                                        $subobj->RemoveService([$item->id]) if $remove_type;

Notice that the "changed" lines are exactly the same, except of course for the 
first one, the one that I actually changed.

This is extremely weird -- too weird for me to debug, unfortunately.  It rather 
worries me that there might be some subtle corrpution in the repository itself.  
Can anyone assist me in finding the source of this?

- -- 
Stephen Clouse <st...@theiqgroup.com>
Senior Programmer/DBE, Core Technology Developer
The IQ Group, Inc. <http://www.theiqgroup.com/>

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.0.7 (GNU/Linux)

iD8DBQE/tDlGA4aoazQ9p2cRAmIuAJ9uqUJKzw47GcxdAWEm9yUZbH/40wCg3T9Q
mkcI5KmAGAsGC7LagKxRDMI=
=ulTS
-----END PGP SIGNATURE-----

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

Re: `svn diff` showing changes that aren't there?

Posted by Ben Collins-Sussman <su...@collab.net>.
On Thu, 2003-11-13 at 20:09, Stephen Clouse wrote:

> This is extremely weird -- too weird for me to debug, unfortunately.  It rather 
> worries me that there might be some subtle corrpution in the repository itself.  
> Can anyone assist me in finding the source of this?

This is a bug in libsvn_diff, already fixed in svn 0.33, which is being
released.... tonight.



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