[Pkg-samba-maint] Workflow new upstream merge in our bzr repo
jelmer at samba.org
Thu Mar 17 14:11:03 UTC 2011
On Wed, 2011-03-16 at 19:15 +0100, Luk Claes wrote:
> On 03/16/2011 07:05 AM, Christian PERRIER wrote:
> > Quoting Luk Claes (luk at debian.org):
> >> On 03/15/2011 10:13 PM, Steve Langasek wrote:
> >>> On Tue, Mar 15, 2011 at 07:56:45PM +0100, Luk Claes wrote:
> >>>> What are the steps I should take to merge a new upstream in our bzr
> >>>> repository? I see that there are upstream refs, though how do they get
> >>>> there as upstream is still git?
> >>> A write-up of the workflow is here:
> >>> http://web.dodds.net/~vorlon/wiki/blog/bzr-git_case_study.html
> >>> In particular, the last two paragraphs apply to merges of new upstream
> >>> versions.
> >> Thanks, I'll have a look.
> > Below is what I saved as "bzr-workflow.txt" in my local work
> > directory.
> > 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
> The --v3 is not recognised (anymore?) when I use unstable and if I try
> the command without that option it complains that it cannot extract the
> orig.tar.gz (which seems to be an exact copy of the upstream tar.bz2).
> How do I fix that without manually creating the orig.tar.gz?
The --v3 option has been removed because bzr-builddeb now looks at
debian/source/format to see if a package is in v3 format.
I've reproduce the .tbz issue and am looking into it now.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Size: 836 bytes
Desc: This is a digitally signed message part
More information about the Pkg-samba-maint