← Back to branch summary

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

« back to all changes in this revision

Viewing changes to Builder.sh

  • Committer: Tarmac
  • Author(s): Jenkins User, Martin Mrazik
  • Date: 2012-06-20 18:38:25 UTC
  • mfrom: (14.1.2 no-merging-for-packaging)
  • Revision ID: tarmac-20120620183825-dn3xo9qao28fxfv5
Get rid of the merge with packaging branch as some teams are not using a common ancestor but an empty branch with debian dir only.. Approved by Víctor R. Ruiz.

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'
80
78
fi
81
79
 
82
 
bzr merge  "$packaging_branch"
 
80
# some people are using packaging branches which only include the debian directory.
 
81
# Others use branch which can be merged. The following will work with both approaches.
 
82
bzr checkout "$packaging_branch" packaging
 
83
if [ -d 'packaging/debian' ]; then
 
84
    mv packaging/debian .
 
85
else
 
86
    echo "Packaging branch doesn't include packaging information. Aborting"
 
87
    exit 1
 
88
fi
83
89
 
84
90
#mv packaging/debian trunk/
85
91
#cd trunk