your thoughts wanted on bzr team UDD focus

[Max Bowsher]

Martin Pool wrote:
> 2009/12/3 James Westby <jw+debian at jameswestby.net>:
> 
>> merge-package
> 
> thanks, that was very clear.
> 
>> To get rid of this we need something that knows to first merge G->C, and
>> then that in to H->F. This will still require the user to resolve conflicts
>> on the G->C merge, but a simple "revert" invocation can be used at that stage,
>> and we have the possibility to automate that for packaging (possibly still
>> called merge-package).
> 
> So, where should this something be hooked in?  Is it a hook that runs
> code similar to merge-package when you're in a packaging branch? (wag)

I don't like the idea that "bzr merge" would make commits if it happens
to be a packaging branch. That seems a little too magical to me. I think
it might be better to keep it as "bzr merge-package". Perhaps with an
"explanatory message and abort" hook in "bzr merge".

Max.

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 197 bytes
Desc: OpenPGP digital signature
Url : https://lists.ubuntu.com/archives/ubuntu-distributed-devel/attachments/20091204/f6a8ec07/attachment.pgp