Re: discussion of ubuntu-desktop packaging branches

2011-04-14 Thread Barry Warsaw 
On Apr 11, 2011, at 10:42 AM, Martin Pitt wrote:

>We could do that. I actually usually do bzr bd -S first, and only
>debcommit -r once that was successful, but I can just ignore the
>warning :)

I usually do things this way too.

-Barry


signature.asc
Description: PGP 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

Re: discussion of ubuntu-desktop packaging branches

2011-04-14 Thread Martin Pitt 
Hello,

Robert Ancell [2011-04-11 12:45 +1000]:
> I don't know exactly what I've broken, but I think it is when I do a
> debcommit without the -r.  I stuffed up the gvfs branch some time ago,
> Seb/Martin fixed it up.  Perhaps they can give more information.

The thing we fixed up back then was using bzr merge-upstream instead
of just bumping the version in debian/changelog.

But not tagging an upload would certainly screw up the branch as well.
Then again, the debian/ only branches are not really different, they
should also do changes with UNRELEASED and then use dch -r/debcommit -r
for uploading.
 
> I think the problem is just you need a tag for each release?  If that is
> the case, then getting bzr-buildpackage -S to warn/prompt the user would
> probably solve this problem.

We could do that. I actually usually do bzr bd -S first, and only
debcommit -r once that was successful, but I can just ignore the
warning :)

Martin

-- 
Martin Pitt| http://www.piware.de
Ubuntu Developer (www.ubuntu.com)  | Debian Developer  (www.debian.org)

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

Re: discussion of ubuntu-desktop packaging branches

2011-04-14 Thread Robert Ancell 
On 04/11/2011 11:43 AM, Martin Pool wrote:
> Robert pointed out
> ,
> about moving to 'normal mode' of bzr-builddeb, in which the entire
> tree is versioned.
>
>> - It is possible to screw up the branches so that bzr merge-package throws a 
>> confusing error (I keep doing it).  Perhaps we need some hooks in bzr to 
>> stop this from occurring.  If it can be broken, it will be broken 
>> (repeatedly).
> Robert, could you tell us more about this or file bugs?
>
> Martin
I don't know exactly what I've broken, but I think it is when I do a
debcommit without the -r.  I stuffed up the gvfs branch some time ago,
Seb/Martin fixed it up.  Perhaps they can give more information.

I think the problem is just you need a tag for each release?  If that is
the case, then getting bzr-buildpackage -S to warn/prompt the user would
probably solve this problem.

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

Re: discussion of ubuntu-desktop packaging branches

2011-04-14 Thread Sebastien Bacher 
Le lundi 11 avril 2011 à 12:45 +1000, Robert Ancell a écrit :
> I don't know exactly what I've broken, but I think it is when I do a
> debcommit without the -r.  I stuffed up the gvfs branch some time
> ago, 

Hi,

The gvfs broken updated didn't have any source change in its commit it
just seemed that you handled it as a debian dir only update, running
dch, commiting and uploading

--
Sebastien Bacher


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