[svk-commit] r2720 - in trunk: t/bm

[nobody at bestpractical.com]

Author: clsung
Date: Mon Mar 31 05:33:49 2008
New Revision: 2720

Modified:
   trunk/lib/SVK/Command/Branch.pm
   trunk/t/bm/local.t

Log:
- implements svk br --push

Modified: trunk/lib/SVK/Command/Branch.pm
==============================================================================
--- trunk/lib/SVK/Command/Branch.pm	(original)
+++ trunk/lib/SVK/Command/Branch.pm	Mon Mar 31 05:33:49 2008
@@ -69,6 +69,7 @@
      'local'            => 'local',
      'from=s'           => 'from',
      'merge'            => 'merge',
+     'push'             => 'push',
      'move'             => 'move',
      'remove'           => 'remove',
      'switch-to'        => 'switch',
@@ -414,6 +415,10 @@
     return;
 }
 
+package SVK::Command::Branch::push;
+use base qw( SVK::Command::Push SVK::Command::Branch);
+use SVK::I18N;
+
 package SVK::Command::Branch::switch;
 use base qw( SVK::Command::Switch SVK::Command::Branch );
 use SVK::I18N;

Modified: trunk/t/bm/local.t
==============================================================================
--- trunk/t/bm/local.t	(original)
+++ trunk/t/bm/local.t	Mon Mar 31 05:33:49 2008
@@ -1,7 +1,7 @@
 #!/usr/bin/perl -w
 use strict;
 use SVK::Test;
-plan tests => 5;
+plan tests => 6;
 our $output;
 
 my ($xd, $svk) = build_test('test');
@@ -45,10 +45,23 @@
 $svk->commit ('-m', 'commit message','');
 
 my $trunk = '/mirror/MyProject/trunk';
-TODO: {
-local $TODO = '--push need to be implemented';
-is_output ($svk, 'branch', ['--push', '-C', 'smerge/foo', 'trunk'],
-    ["Auto-merging (0, 10) /local/MyProject/localfoo to $trunk (base $trunk:12).",
-     "Checking locally against mirror source $uri.", 'U   B/S/Q/qu',
-     qr'New merge ticket: [\w\d-]+:/localfoo:9']);
-}
+is_output ($svk, 'branch', ['--push', '-C'],
+    ["Auto-merging (0, 10) /local/MyProject/localfoo to $trunk (base $trunk:6).",
+     "===> Auto-merging (0, 9) /local/MyProject/localfoo to $trunk (base $trunk:6).",
+     "Empty merge.",
+     "===> Auto-merging (9, 10) /local/MyProject/localfoo to $trunk (base $trunk:6).",
+     'U   B/S/Q/qu',
+     qr'New merge ticket: [\w\d-]+:/local/MyProject/localfoo:10']);
+is_output ($svk, 'branch', ['--push'],
+    ["Auto-merging (0, 10) /local/MyProject/localfoo to $trunk (base $trunk:6).",
+     "===> Auto-merging (0, 9) /local/MyProject/localfoo to $trunk (base $trunk:6).",
+     "Merging back to mirror source $uri.",
+     "Empty merge.",
+     "===> Auto-merging (9, 10) /local/MyProject/localfoo to $trunk (base $trunk:6).",
+     "Merging back to mirror source $uri.",
+     'U   B/S/Q/qu',
+     qr'New merge ticket: [\w\d-]+:/local/MyProject/localfoo:10',
+     "Merge back committed as revision 7.",
+     "Syncing $uri",
+     "Retrieving log information from 7 to 7",
+     "Committed revision 11 from revision 7."]);