your thoughts wanted on bzr team UDD focus

Martin Pool mbp at canonical.com
Thu Dec 3 04:54:28 GMT 2009


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)

-- 
Martin <http://launchpad.net/~mbp/>



More information about the ubuntu-distributed-devel mailing list