To get this branch, use:
bzr branch https://code.breezy-vcs.org/breezy-debian/unstable

Viewing all changes in revision 321.1.4.

  • 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.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: