[Bps-public-commit] smokingit branch, master, updated. 7310a127b02f685ee9647083bd50a35203ce528b

[Alex Vandiver]

The branch, master has been updated
       via  7310a127b02f685ee9647083bd50a35203ce528b (commit)
      from  3fee8b7d289c8051b168a7d1ab928b4790a9ecc0 (commit)

Summary of changes:
 lib/Smokingit/Action/UpdateBranch.pm |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

- Log -----------------------------------------------------------------
commit 7310a127b02f685ee9647083bd50a35203ce528b
Author: Alex Vandiver <alex at chmrr.net>
Date:   Mon Jan 31 10:19:51 2011 -0500

    ->trunks is on a project, not a branch

diff --git a/lib/Smokingit/Action/UpdateBranch.pm b/lib/Smokingit/Action/UpdateBranch.pm
index e47b968..016da30 100644
--- a/lib/Smokingit/Action/UpdateBranch.pm
+++ b/lib/Smokingit/Action/UpdateBranch.pm
@@ -17,7 +17,7 @@ sub arguments {
 
     my $args = $self->SUPER::arguments;
 
-    my $branches = $self->record->trunks;
+    my $branches = $self->record->project->trunks;
 
     $args->{to_merge_into}{valid_values} = [
         {

-----------------------------------------------------------------------