[Pkg-samba-maint] Workflow new upstream merge in our bzr repo

[Jelmer Vernooij]

On Wed, 2011-03-16 at 07:05 +0100, Christian PERRIER wrote:
> Merging a new upstream version:
> 
>  $ cd cifs-utils
>  $ wget ftp://ftp.samba.org/pub/samba/cifs-utils/cifs-utils-$version.tar.bz2
>  $ cd trunk
>  $ bzr merge-upstream --v3 --version $version_with_epoch \
>      ../cifs-utils-$version.tar.bz2 -r tag:cifs-utils-$version \
>      bzr+ssh://bzr.debian.org/bzr/pkg-samba/cifs-utils/upstream/HEAD
>  No distribution specified, and no changelog, assuming 'debian'
>  Committing to: /tmp/tmpbzOVMs/upstream/
>  Committed revision 2.
>  All changes applied successfully.
>  The new upstream version has been imported.
>  You should now review the changes and then commit.

FWIW Newer versions of bzr-builddeb (e.g. 2.7.x in unstable) now
integrates with uscan and can get the upstream branch location
from .bzr-builddeb/default.conf, so something like this should be
sufficient once the upstream-branch setting is added
to .bzr-builddeb/default.conf [1]:

$ bzr merge-upstream --version $version_with_epoch
-rtag:cifs-utils-$version

(The --version and --revision arguments are required at the moment
because bzr-builddeb doesn't have any magic to determine the tag name
yet).

Cheers,

Jelmer

[1] This sort of information shouldn't really be in a
bzr-builddeb-specific file, but in debian/watch or a debian/watch-like
file. I'm planning to reopen that discussion on debian-devel@ again.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: This is a digitally signed message part
URL: <http://lists.alioth.debian.org/pipermail/pkg-samba-maint/attachments/20110317/3bf24f9f/attachment.pgp>