[Bps-public-commit] r16761 - in Prophet/trunk: .

[sartak at bestpractical.com]

Author: sartak
Date: Sat Nov  8 03:10:01 2008
New Revision: 16761

Modified:
   Prophet/trunk/   (props changed)
   Prophet/trunk/t/Settings/t/sync-database-settings.t

Log:
 r74463 at onn:  sartak | 2008-10-22 16:39:06 -0400
 Change the test from merge, which works, to pull, which fails (yikes)


Modified: Prophet/trunk/t/Settings/t/sync-database-settings.t
==============================================================================
--- Prophet/trunk/t/Settings/t/sync-database-settings.t	(original)
+++ Prophet/trunk/t/Settings/t/sync-database-settings.t	Sat Nov  8 03:10:01 2008
@@ -20,7 +20,7 @@
 
 };
 as_bob {
-    run_ok( 'settings', [ 'merge', '--from', repo_uri_for('alice'), '--to', repo_uri_for('bob') ], "Sync ran ok!" );
+    run_ok( 'settings', [ 'pull', '--from', repo_uri_for('alice') ]);
     my ($return, $stdout, $stderr) = run_script('settings', [qw(settings --show)]);
     like($stdout, qr/default_status: \["open"\]/, "the original milestone list is there");
     run_ok('settings', [qw(settings --set -- default_status ["stalled"])]);