On Tue, 20 Mar 2012 18:06:52 -0300, Andreas Hasenack <andr...@canonical.com> wrote: > Yes, and I don't have commit or upload rights to > ubuntu:landscape-client, so it will always be the first time :)
If your sponsor pushes to the branch then it will be there for the next time that you make a change. > 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 :-) > It also makes it very hard to review the changes this first time, > right? The diff isn't helpful. Yeah, the best thing to do I think is to fall back to "diff -Nru" of two trees so that you diff based on paths rather than file ids. I'm not aware of anyway to get bzr to do this. Thanks, James -- 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
