On Fri, Apr 22, 2011 at 01:12:09PM +0200, jprovazn(a)redhat.com wrote:
Rebased on current next
Unfortunately, it seems that these files are being touched by many
people. The second patch ('Added deployment launch UI') is still
failing to apply for me on the latest next. git-am says:
Applying: Added deployment launch UI
error: patch failed:
src/app/controllers/resources/deployments_controller.rb:33
error: src/app/controllers/resources/deployments_controller.rb: patch
does not apply
error: patch failed: src/features/deployable.feature:91
error: src/features/deployable.feature: patch does not apply
error: patch failed:
src/features/step_definitions/deployable_steps.rb:18
error: src/features/step_definitions/deployable_steps.rb: patch does not
apply
Patch failed at 0001 Added deployment launch UI
When you get back, would you mind rebasing once more?
-- Matt