[Bps-public-commit] r14176 - in sd/trunk: .

[sartak at bestpractical.com]

Author: sartak
Date: Wed Jul 16 18:55:29 2008
New Revision: 14176

Modified:
   sd/trunk/   (props changed)
   sd/trunk/t/sd-rt-hm.t

Log:
 r64454 at onn:  sartak | 2008-07-16 18:55:17 -0400
 Use the --force argument to allow multi-db merge


Modified: sd/trunk/t/sd-rt-hm.t
==============================================================================
--- sd/trunk/t/sd-rt-hm.t	(original)
+++ sd/trunk/t/sd-rt-hm.t	Wed Jul 16 18:55:29 2008
@@ -96,7 +96,7 @@
     diag($err) if ($err);
     run_output_matches( 'sd', [ 'ticket', 'list', '--regex', '.' ], [qr/^(.*?)(?{ $bob_flyman_id = $1 }) Fly Man new/] );
     diag("Bob pulling from alice");
-    ( $ret, $out, $err ) = run_script( 'sd', [ 'pull', '--from', repo_uri_for('alice') ] );
+    ( $ret, $out, $err ) = run_script( 'sd', [ 'pull', '--from', repo_uri_for('alice'), '--force' ] );
 
     $flyman_uuid = get_uuid_for_luid($bob_flyman_id);
     my $bob_yatta_id = get_luid_for_uuid($yatta_uuid);
@@ -117,7 +117,7 @@
 
 as_alice {
     local $ENV{SD_REPO} = $ENV{'PROPHET_REPO'};
-    ( $ret, $out, $err ) = run_script( 'sd', [ 'pull', '--from', repo_uri_for('bob') ] );
+    ( $ret, $out, $err ) = run_script( 'sd', [ 'pull', '--from', repo_uri_for('bob'), '--force' ] );
 
 
     $alice_flyman_id = get_luid_for_uuid($flyman_uuid);