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

[sartak at bestpractical.com]

Author: sartak
Date: Thu Jul 17 17:32:14 2008
New Revision: 14237

Modified:
   Prophet/trunk/   (props changed)
   Prophet/trunk/lib/Prophet/Replica.pm

Log:
 r64521 at onn:  sartak | 2008-07-17 17:20:04 -0400
 Include database uuids in the different-database-merge error


Modified: Prophet/trunk/lib/Prophet/Replica.pm
==============================================================================
--- Prophet/trunk/lib/Prophet/Replica.pm	(original)
+++ Prophet/trunk/lib/Prophet/Replica.pm	Thu Jul 17 17:32:14 2008
@@ -422,7 +422,9 @@
             warn "You are merging two different databases! This is highly unusual.";
         }
         else {
-            confess "You are trying to merge two different databases! If you really want to do this, try adding a --force argument.";
+            confess "You are trying to merge two different databases! If you really want to do this, try adding a --force argument.\n"
+            . "Local database:  " . $self->db_uuid      . "\n"
+            . "Remote database: " . $args{for}->db_uuid . "\n";
         }
     }