From: Zygo Blaxell <zblaxell@waya.furryterror.org>
Date: Sat, 9 Jan 2010 01:51:45 +0000 (-0500)
Subject: Merge branch 'performance'
X-Git-Tag: dm6-0.20100514~31
X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=dupemerge;a=commitdiff_plain;h=776aeabce8add0b31e16bb91b13e6cb9fcee682a

Merge branch 'performance'

Conflicts:
	faster-dupemerge
---

776aeabce8add0b31e16bb91b13e6cb9fcee682a
diff --cc faster-dupemerge
index 0b43a3c,6223ab0..d35f591
--- a/faster-dupemerge
+++ b/faster-dupemerge
@@@ -343,9 -342,9 +343,9 @@@ hash_file
  link_start:
  
  				until ($finished) {
- 					my @incumbent_names = keys(%{$inode_to_file_name{$incumbent}});
- 					my @candidate_names = keys(%{$inode_to_file_name{$candidate}});
+ 					my @incumbent_names = sort keys(%{$inode_to_file_name{$incumbent}});
+ 					my @candidate_names = sort keys(%{$inode_to_file_name{$candidate}});
 -					print STDERR "\t\tLinks to $incumbent:",   join("\n\t\t\t", '', @incumbent_names),   "\n" if $debug;
 +					print STDERR "\t\tLinks to $incumbent:", join("\n\t\t\t", '', @incumbent_names), "\n" if $debug;
  					print STDERR "\t\tLinks to $candidate:", join("\n\t\t\t", '', @candidate_names), "\n" if $debug;
  
  incumbent_file:
@@@ -537,7 -544,7 +543,7 @@@ end_merge
  }
  
  while (<FIND>) {
- 	my ($weak_key, $inode, $name) = m/^(\d+ \d+ \d+ \d+ -?[\d.]+) (\d+) (.+)\0$/so;
 -	my ($weak_key, $inode, $name) = m/^(\d+ \d+ \d+ \d+ -?\d+) (\d+:\d+) (.+)\0$/so;
++	my ($weak_key, $inode, $name) = m/^(\d+ \d+ \d+ \d+ -?[\d.]+) (\d+:\d+) (.+)\0$/so;
  	die "read error: $!\nLast input line was '$_'" unless defined($name);
  
  	print STDERR "weak_key=$weak_key inode=$inode name=$name\n" if $debug;