~barry/bzr-builddeb/609186-urls

« back to all changes in this revision

Viewing changes to debian/changelog

  • Committer: James Westby
  • Date: 2009-02-18 18:36:18 UTC
  • mto: This revision was merged to the branch mainline in revision 323.
  • Revision ID: jw+debian@jameswestby.net-20090218183618-0wuajt2nbtpcooag
Kill off export-upstream mode.

merge-upstream will be improved to merge the upstream branch, store it with
pristine-tar, and then produce the tarball as needed.

Using export-upstream for snapshots is now incorrect. You should use
"merge-upstream" every time instead, which will track if there is nothing
to do, and handle conflicts. You can autocommit the merge and build the
result if you like.

Show diffs side-by-side

added added

removed removed

Lines of Context:
26
26
    a much better situation.
27
27
  * Update the changelog after merge-upstream, rather than telling the user
28
28
    exactly what to run. (LP: #296516)
 
29
  * Remove export-upstream mode in favour of merge-upstream, see NEWS.Debian.
29
30
 
30
31
  [ Kees Cook ]
31
32
  * builder.py: switch to using external tar command to replace buggy