[Bps-public-commit] r11358 - in SVN-PropDB: . bin

[jesse at bestpractical.com]

Author: jesse
Date: Tue Apr  1 21:46:15 2008
New Revision: 11358

Added:
   SVN-PropDB/MANIFEST
   SVN-PropDB/MANIFEST.SKIP
Removed:
   SVN-PropDB/bin/svn-replay
Modified:
   SVN-PropDB/   (props changed)
   SVN-PropDB/Makefile.PL
   SVN-PropDB/bin/generalized_sync_n_merge.t
   SVN-PropDB/lib/Prophet/Handle.pm

Log:
 r28936 at 70-5-79-205:  jesse | 2008-04-01 15:45:30 -1000
  * minor cleanup


Added: SVN-PropDB/MANIFEST
==============================================================================
--- (empty file)
+++ SVN-PropDB/MANIFEST	Tue Apr  1 21:46:15 2008
@@ -0,0 +1,64 @@
+bin/generalized_sync_n_merge.t
+bin/prophet-merge
+bin/prophet-node-create
+bin/prophet-node-delete
+bin/prophet-node-history
+bin/prophet-node-search
+bin/prophet-node-show
+bin/prophet-node-update
+bin/run_test_yml.pl
+doc/glossary
+doc/notes-on-merging
+doc/repository-layout
+doc/todo
+inc/Module/Install.pm
+inc/Module/Install/Base.pm
+inc/Module/Install/Can.pm
+inc/Module/Install/Fetch.pm
+inc/Module/Install/Makefile.pm
+inc/Module/Install/Metadata.pm
+inc/Module/Install/Win32.pm
+inc/Module/Install/WriteAll.pm
+lib/Prophet.pm
+lib/Prophet/Change.pm
+lib/Prophet/ChangeSet.pm
+lib/Prophet/CLI.pm
+lib/Prophet/Collection.pm
+lib/Prophet/Conflict.pm
+lib/Prophet/ConflictingChange.pm
+lib/Prophet/ConflictingPropChange.pm
+lib/Prophet/Handle.pm
+lib/Prophet/HistoryEntry.pm
+lib/Prophet/PropChange.pm
+lib/Prophet/Record.pm
+lib/Prophet/Resolver.pm
+lib/Prophet/Resolver/AlwaysSource.pm
+lib/Prophet/Resolver/AlwaysTarget.pm
+lib/Prophet/Resolver/Failed.pm
+lib/Prophet/Resolver/FromResolutionDB.pm
+lib/Prophet/Resolver/IdenticalChanges.pm
+lib/Prophet/Resolver/Prompt.pm
+lib/Prophet/Sync/Source.pm
+lib/Prophet/Sync/Source/SVN.pm
+lib/Prophet/Sync/Source/SVN/ReplayEditor.pm
+lib/Prophet/Sync/Source/SVN/Util.pm
+lib/Prophet/Test.pm
+lib/Prophet/Test/Arena.pm
+lib/Prophet/Test/Participant.pm
+Makefile
+Makefile.PL
+MANIFEST			This list of files
+MANIFEST.SKIP
+META.yml
+t/01-dependencies.t
+t/99-pod-coverage.t
+t/99-pod.t
+t/canonicalize.t
+t/create.t
+t/lib/TestApp/Bug.pm
+t/non-conflicting-merge.t
+t/real-conflicting-merge.t
+t/simple-conflicting-merge.t
+t/sync_3party.t
+t/use.t
+t/validate.t

Added: SVN-PropDB/MANIFEST.SKIP
==============================================================================
--- (empty file)
+++ SVN-PropDB/MANIFEST.SKIP	Tue Apr  1 21:46:15 2008
@@ -0,0 +1,5 @@
+~$
+.tmp*
+.sw?$
+.svn$
+.bak$

Modified: SVN-PropDB/Makefile.PL
==============================================================================
--- SVN-PropDB/Makefile.PL	(original)
+++ SVN-PropDB/Makefile.PL	Tue Apr  1 21:46:15 2008
@@ -1,12 +1,19 @@
 #!/usr/bin/perl
 #
 use inc::Module::Install;
+name('Prophet');
+author('clkao and jesse');
+license('Death and Repudiation');
 requires('Params::Validate');
 requires('Class::Accessor');
 requires('IPC::Run3');
 requires('Test::Exception');
 requires('Data::UUID');
 requires('Path::Class');
+requires('YAML::Syck');
+requires('Acme::MetaSyntactic');
+requires('UNIVERSAL::require');
+
 requires('SVN::Core'); # SVN::Repos SVN::Fs SVN::Ra SVN::Delta::Editor SVN::Client SVN::Delta
 all_from('lib/Prophet.pm');
 

Modified: SVN-PropDB/bin/generalized_sync_n_merge.t
==============================================================================
--- SVN-PropDB/bin/generalized_sync_n_merge.t	(original)
+++ SVN-PropDB/bin/generalized_sync_n_merge.t	Tue Apr  1 21:46:15 2008
@@ -32,8 +32,7 @@
 if (grep { !$_ } $Test->summary) {
     my $fname = join('-', sort map { $_->name } @{$arena->chickens}).'.yml';
     diag "test failed... dumping recipe to $fname";
-    use YAML;
-    YAML::DumpFile( $fname,
+    YAML::Syck::DumpFile( $fname,
         { chickens => [ map { $_->name } @{ $arena->chickens } ],
             recipe => $arena->{history}
         } );

Modified: SVN-PropDB/lib/Prophet/Handle.pm
==============================================================================
--- SVN-PropDB/lib/Prophet/Handle.pm	(original)
+++ SVN-PropDB/lib/Prophet/Handle.pm	Tue Apr  1 21:46:15 2008
@@ -422,6 +422,8 @@
 
 }
 
-
+use YAML::Syck;
+package YAML;
+*Dump     = *YAML::Syck::Dump;
 
 1;