Browse files

generate-git-snapshot: make sure to revert to original debian/changel…

…og to avoid merge conflicts

Thanks to Raphaël Hertzog for spotting the issue
when investigating build errors in dpkg's Jenkins job.


| jenkins@grml-jenkins:~/jobs/dpkg-source/workspace/source$ git pull
| Updating fb18783..91495b8
| error: Your local changes to 'debian/changelog' would be overwritten by merge.  Aborting.
| Please, commit your changes or stash them before you can merge.
| jenkins@grml-jenkins:~/jobs/dpkg-source/workspace/source$
  • Loading branch information...
1 parent 772ff4c commit c7edd530b5386f313a50aa4251d6c03ca89c732f @mika committed Nov 21, 2011
Showing with 3 additions and 0 deletions.
  1. +3 −0 scripts/generate-git-snapshot
@@ -123,6 +123,9 @@ if ! git-buildpackage -tc --git-ignore-new -S -us -uc ; then
dpkg-source -b source
+# revert to original debian/changelog to avoid merge conflicts
+( cd source/ ; git checkout -- debian/changelog )
# needed for deploying artifacts
mkdir -p ${JENKINS_HOME}/userContent/${JOB_NAME}/

0 comments on commit c7edd53

Please sign in to comment.