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

[Luk Claes]

On 03/17/2011 03:02 PM, Jelmer Vernooij wrote:
> On Wed, 2011-03-16 at 07:05 +0100, Christian PERRIER wrote:
>> Merging a new upstream version:

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

I can't get this to work, can you please spell out how the
~/.bzr-builddeb/default.conf file should look like, TIA?

I'm probably missing something obvious.

Cheers

Luk