← Back to branch summary

~vrruiz/pbuilderjenkins/online-accounts-account-plugins

« back to all changes in this revision

Viewing changes to Builder.sh

  • Committer: Martin Mrazik
  • Date: 2012-05-25 12:02:34 UTC
  • Revision ID: martin.mrazik@canonical.com-20120525120234-9ip40wva5ax9ehye
we need to commit before merging the packaging information

Show diffs side-by-side

added added

removed removed

Lines of Context:
Builder.sh
75
75
    bzr branch "$target_branch" "$work_dir/trunk"
76
76
    cd "$work_dir/trunk"
77
77
    bzr merge "$main_branch"
 
78
    bzr whoami 'Jenkins User <jenkins@jenkins>'
 
79
    bzr commit -m 'merging target with autolanding candidate'
78
80
fi
79
81
 
80
82
bzr merge  "$packaging_branch"