On Tuesday, July 20, 2010 06:50:23 am Martin Pool wrote: > On 20 July 2010 00:09, Scott Kitterman <[email protected]> wrote: > > On Monday, July 19, 2010 05:59:22 pm Francis J. Lacoste wrote: > > > > It's not apparent to me that enough has changed since I wrote this: > > > > https://lists.ubuntu.com/archives/ubuntu-distributed-devel/2010- > > January/000373.html > > > > to warrant giving it another try. > > Fair enough, there are some things that are not fixed there. Some are > fixed: > > * changelogs should now autoresolve conflicts: > <https://bugs.edge.launchpad.net/bzr-builddeb/+bug/516060> and > friends, but perhaps more can be done > * needing to bzr commit as well as editing the changelog: you can > either use 'debcommit' or bzr will use the changes to the > debian/changelog as the suggested message > <https://bugs.edge.launchpad.net/bugs/331993>; this might need to be > better documented > * merge-upstream should automatically populate debian/changelog with > "new upstream" etc > <https://bugs.edge.launchpad.net/ubuntu/+source/bzr-builddeb/+bug/296516> > > Some still need to be done: > > * https://bugs.edge.launchpad.net/bzr-builddeb/+bug/607682 - better > workflow for getting all the relevant branches > * https://bugs.edge.launchpad.net/bzr-builddeb/+bug/607684 - single > command to push and upload > > Both require some design work. > > You also had the issue that the documentation needs to be better, > which is probably still true but not a very good bug to file. > > I believe Barry also has a bunch of UDD bugs to file, including about > giving warnings when things are out of date.
Specifically for merging, I think an equivalent of grab-merge (I'll go so far as to suggest implementing something in grab-merge and then people can grab- merge --bzr or something) and an easy way to diff just the non-upstream changes are essential to broader adoption. Scott K -- ubuntu-distributed-devel mailing list [email protected] Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/ubuntu-distributed-devel
