[svk-commit] r2891 - trunk/lib/SVK

[nobody at bestpractical.com]

Author: clkao
Date: Tue May 20 23:12:43 2008
New Revision: 2891

Modified:
   trunk/lib/SVK/Merge.pm

Log:
Don't use a merge base that is part of a condensed skip-to sync.


Modified: trunk/lib/SVK/Merge.pm
==============================================================================
--- trunk/lib/SVK/Merge.pm	(original)
+++ trunk/lib/SVK/Merge.pm	Tue May 20 23:12:43 2008
@@ -240,6 +240,10 @@
 	my ($path) = m/:(.*)$/;
 	my $rev = $joint_info->{$_};
 
+        # if the candidate is condensed (like being part of a skip-to
+        # sync), we can't really use it as base
+        next if $rev == -1;
+
 	# when the base is one of src or dst, make sure the base is
 	# still the same node (not removed and replaced)
 	if ($rev && $path eq $dst->path) {