[svk-commit] r2605 - in branches/bm: t/bm

[nobody at bestpractical.com]

Author: clsung
Date: Wed Nov 14 04:10:09 2007
New Revision: 2605

Modified:
   branches/bm/lib/SVK/Command/Branch.pm
   branches/bm/t/bm/merge.t

Log:
- remove SVK::Command::Switch from base of SVK::Command::Branch::merge
- remove traverse_history() from SVK::Command::Branch::merge
- add test, merge multiple branches w/o -C will have 'G  ...'
- the 13rd test still fail

Modified: branches/bm/lib/SVK/Command/Branch.pm
==============================================================================
--- branches/bm/lib/SVK/Command/Branch.pm	(original)
+++ branches/bm/lib/SVK/Command/Branch.pm	Wed Nov 14 04:10:09 2007
@@ -298,9 +298,9 @@
 }
 
 package SVK::Command::Branch::merge;
-use base qw( SVK::Command::Smerge SVK::Command::Switch SVK::Command::Branch);
+use base qw( SVK::Command::Smerge SVK::Command::Branch);
 use SVK::I18N;
-use SVK::Util qw( is_uri traverse_history );
+use SVK::Util qw( is_uri );
 
 use constant narg => 1;
 

Modified: branches/bm/t/bm/merge.t
==============================================================================
--- branches/bm/t/bm/merge.t	(original)
+++ branches/bm/t/bm/merge.t	Wed Nov 14 04:10:09 2007
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 use strict;
-use Test::More tests => 13;
+use Test::More tests => 14;
 use SVK::Test;
 use File::Path;
 
@@ -63,7 +63,8 @@
      qr'New merge ticket: [\w\d-]+:/branches/feature/bar:9',
      "Auto-merging (0, 8) $branch_foo to $trunk (base $trunk:6).",
      "Checking locally against mirror source $uri.", 'UU  A/be',
-     qr'New merge ticket: [\w\d-]+:/branches/feature/foo:7']);
+     qr'New merge ticket: [\w\d-]+:/branches/feature/foo:7'],
+    "Check multiple branch merge");
 
 is_output_like ($svk, 'branch', ['--merge', 'feature/bar', 'feature/foo', 'trunk'], 
     qr/Committed revision 12 from revision 11./);
@@ -97,3 +98,25 @@
      "Auto-merging (0, 16) $branch_foo to $trunk (base $trunk:12).",
      "Checking locally against mirror source $uri.", 'G   B/S/Q/qu',
      qr'New merge ticket: [\w\d-]+:/branches/smerge/foo:15']);
+
+is_output ($svk, 'branch', ['--merge', 'smerge/bar', 'smerge/foo', 'trunk'], 
+    ["Auto-merging (0, 14) $branch_bar to $trunk (base $trunk:12).",
+     "Merging back to mirror source $uri.", 'U   B/S/Q/qu',
+     qr'New merge ticket: [\w\d-]+:/branches/smerge/bar:13',
+     'Merge back committed as revision 16.', "Syncing $uri",
+     'Retrieving log information from 16 to 16',
+     'Committed revision 17 from revision 16.',
+     "Auto-merging (0, 16) $branch_foo to $trunk (base $trunk:12).",
+     "Merging back to mirror source $uri.", 'G   B/S/Q/qu',
+     qr'New merge ticket: [\w\d-]+:/branches/smerge/foo:15',
+     'Merge back committed as revision 17.', "Syncing $uri",
+     'Retrieving log information from 17 to 17',
+     'Committed revision 18 from revision 17.']);
+#$svk->smerge('-m', "blah", "//mirror/MyProject/branches/smerge/bar", "//mirror/MyProject/trunk");
+#$svk->smerge('-C',"//mirror/MyProject/branches/smerge/foo", "//mirror/MyProject/trunk");
+#warn $output;
+#is_output ($svk, 'branch', ['--merge', '-C', 'smerge/foo', 'trunk'], 
+#    ["Auto-merging (0, 16) $branch_foo to $trunk (base $trunk:12).",
+#     "Checking locally against mirror source $uri.", 'G   B/S/Q/qu',
+#     qr'New merge ticket: [\w\d-]+:/branches/smerge/foo:15']);
+#warn $output;