Mercurial > hg > soundsoftware-site
view app/models/repository/mercurial.rb.rej @ 431:d3af621ba9d4 bug_168
Update the master branch via git pull master rather than git fetch (which doesn't merge any particular branch)
author | Chris Cannam |
---|---|
date | Sun, 05 Jun 2011 10:28:27 +0100 |
parents | 1d32c0a0efbf |
children |
line wrap: on
line source
--- app/models/repository/mercurial.rb +++ app/models/repository/mercurial.rb @@ -78,11 +78,7 @@ :comments => revision.message) revision.paths.each do |change| - Change.create(:changeset => changeset, - :action => change[:action], - :path => change[:path], - :from_path => change[:from_path], - :from_revision => change[:from_revision]) + changeset.create_change(change) end end end unless revisions.nil?