[Bps-public-commit] r14765 - Prophet/branches/creator/lib/Prophet

[sartak at bestpractical.com]

Author: sartak
Date: Mon Aug  4 16:35:39 2008
New Revision: 14765

Modified:
   Prophet/branches/creator/lib/Prophet/Conflict.pm

Log:
The person who resolves a conflict is that resolution/nullification changeset's creator

Modified: Prophet/branches/creator/lib/Prophet/Conflict.pm
==============================================================================
--- Prophet/branches/creator/lib/Prophet/Conflict.pm	(original)
+++ Prophet/branches/creator/lib/Prophet/Conflict.pm	Mon Aug  4 16:35:39 2008
@@ -82,7 +82,10 @@
         $self->resolvers,
         sub { Prophet::Resolver::Failed->new->run(@_) },
     );
-    my $resolutions = Prophet::ChangeSet->new( { is_resolution => 1 } );
+    my $resolutions = Prophet::ChangeSet->new({
+        creator       => $self->prophet_handle->changeset_creator,
+        is_resolution => 1,
+    });
     for my $conflicting_change ( @{ $self->conflicting_changes } ) {
         for (@resolvers) {
             if ( my $resolution = $_->( $conflicting_change, $self, $resdb ) ) {
@@ -206,7 +209,10 @@
 
 sub generate_nullification_changeset {
     my $self = shift;
-    my $nullification = Prophet::ChangeSet->new( { is_nullification => 1 } );
+    my $nullification = Prophet::ChangeSet->new({
+        creator          => $self->prophet_handle->changeset_creator,
+        is_nullification => 1,
+    });
 
     for my $conflict ( @{ $self->conflicting_changes } ) {
         my $nullify_conflict