[svk-commit] r2479 - in branches/2.0-releng: lib/SVK t

[nobody at bestpractical.com]

Author: clkao
Date: Tue Jul 17 11:07:23 2007
New Revision: 2479

Added:
   branches/2.0-releng/t/07smerge-copy2.t
Modified:
   branches/2.0-releng/MANIFEST
   branches/2.0-releng/lib/SVK/Merge.pm

Log:
merge from trunk:
 r2373 at trunk:  clkao | 2007-04-03 08:29:22 +0100
 Fix the mysterious "file not found at revision 0" bug when
 smerge to a mirror where copy source is not normalized.
 


Modified: branches/2.0-releng/MANIFEST
==============================================================================
--- branches/2.0-releng/MANIFEST	(original)
+++ branches/2.0-releng/MANIFEST	Tue Jul 17 11:07:23 2007
@@ -199,6 +199,7 @@
 t/07smerge-branch-renamed.t
 t/07smerge-copy-co.t
 t/07smerge-copy.t
+t/07smerge-copy2.t
 t/07smerge-delete.t
 t/07smerge-dir-replaced.t
 t/07smerge-external.t

Modified: branches/2.0-releng/lib/SVK/Merge.pm
==============================================================================
--- branches/2.0-releng/lib/SVK/Merge.pm	(original)
+++ branches/2.0-releng/lib/SVK/Merge.pm	Tue Jul 17 11:07:23 2007
@@ -610,12 +610,14 @@
 		      $self->resolve_copy($srcinfo, $dstinfo, @_);
 		  return unless defined $dst_from;
 		  # ensure the dst from path exists
-		  return unless $self->{dst}->root->fs->revision_root($dst_fromrev)->check_path($dst_from);
+		  my $dst_path = SVK::Path->real_new({depot => $self->{dst}->depot, path => $dst_from, revision => $dst_fromrev});
+		  return unless $dst_path->root->check_path($dst_path->path);
+		  $dst_path->normalize;
 		  # Because the delta still need to carry the copy
 		  # information of the source, make merge editor note
 		  # the mapping so it can do the translation
 		  $meditor->copy_info($src_from, $src_fromrev,
-				     $dst_from, $dst_fromrev);
+				      $dst_path->path, $dst_path->revision);
 
 		  return ($src_from, $src_fromrev);
 	      } );

Added: branches/2.0-releng/t/07smerge-copy2.t
==============================================================================
--- (empty file)
+++ branches/2.0-releng/t/07smerge-copy2.t	Tue Jul 17 11:07:23 2007
@@ -0,0 +1,12 @@
+#!/usr/bin/perl -w
+
+# TODO: Write a smerge test that includes a copy from rev that isn't
+# resolvable to the mirror's remote rev.  This resulted in mysterious
+# 'file not found: revision 0' and is now fixed.
+
+use Test::More tests => 1;
+
+TODO: {
+todo_skip "doesn't exist", 1;
+
+}