Update of /home/cvsd/slony1/slony1-engine/tools/altperl
In directory main.slony.info:/tmp/cvs-serv26979

Modified Files:
      Tag: REL_2_0_STABLE
	slonik_merge_sets.pl 
Log Message:
Improve documentation of what MERGE SET does, per Mark Stosberg


Index: slonik_merge_sets.pl
===================================================================
RCS file: /home/cvsd/slony1/slony1-engine/tools/altperl/slonik_merge_sets.pl,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -d -r1.3 -r1.3.2.1
*** slonik_merge_sets.pl	14 Feb 2008 16:41:35 -0000	1.3
--- slonik_merge_sets.pl	1 Apr 2009 19:03:27 -0000	1.3.2.1
***************
*** 15,21 ****
  
  my $USAGE =
! "Usage: merge_sets [--config file] node# set# set#
  
      Merges the contents of the second set into the first one.
  
  ";
--- 15,22 ----
  
  my $USAGE =
! "Usage: merge_sets [--config file] node# targetset# srcset#
  
      Merges the contents of the second set into the first one.
+     When completed, the second set no longer exists.
  
  ";
***************
*** 60,67 ****
  $slonik .= "    merge set (id = $set1, add id = $set2, origin = $node);\n";
  $slonik .= "  } on error {\n";
! $slonik .= "    echo 'Failure to merge sets $set1 and $set2 with origin $node';\n";
  $slonik .= "    exit 1;\n";
  $slonik .= "  }\n";
! $slonik .= "  echo 'Replication set $set2 merged in with $set1 on origin $node';\n";
  
  run_slonik_script($slonik, 'MERGE SET');
--- 61,68 ----
  $slonik .= "    merge set (id = $set1, add id = $set2, origin = $node);\n";
  $slonik .= "  } on error {\n";
! $slonik .= "    echo 'Failure to merge set $set2 into $set1 with origin $node';\n";
  $slonik .= "    exit 1;\n";
  $slonik .= "  }\n";
! $slonik .= "  echo 'Replication set $set2 merged into $set1 on origin $node. Set $set2 no longer exists.';\n";
  
  run_slonik_script($slonik, 'MERGE SET');