Am 29/03/12 16:02, schrieb James Westby: > On Thu, 29 Mar 2012 12:21:41 +0200, Jelmer Vernooij <jel...@canonical.com> > wrote: >> Am 29/03/12 05:14, schrieb James Westby: >>> On Tue, 20 Mar 2012 18:06:52 -0300, Andreas Hasenack >>> <andr...@canonical.com> wrote: >>>> I understand they are isolated and separated branches. I thought >>>> supporting a bzr branch for the upstream branch was more of a >>>> convenience and that merge-upstream would actually just export it to a >>>> temporary tarball and then move on like if I had given it a tarball to >>>> work with, but I see now that's not the case. >>> Yeah, there is some old code in bzr-builddeb to do that, but I've >>> forgotten how to activate it now :-) >> I think I'm missing some context - are you talking about running "bzr >> merge-upstream <branch>" ? That should still work. > That will merge in the branch as well as export the tarball right? Yeah. > I think Andreas was asking about a way to just export the tarball and > use it in merge-upstream without also merging the branch. Aha. I guess you could always use something like this:
bzr export -d <upstream-branch> foo-0.1.tar.gz bzr merge-upsteam foo-0.1.tar.gz Cheers, Jelmer
signature.asc
Description: OpenPGP digital signature
-- ubuntu-distributed-devel mailing list ubuntu-distributed-devel@lists.ubuntu.com Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/ubuntu-distributed-devel
