== General changes == #776688: network-console - Please merge network-console (1.28) from debian unstable I'd already done this independently. Closed.
#776715: ntfs-3g - Sync ntfs-3g 1:2011.1.15-0.1 (main) from Debian unstable (main) This wasn't validly syncable, so marked won't fix. I already had a merge in progress, and completed that this morning. #774233: vim - Merge vim 2:7.3.154+hg~74503f6ee649-2 from Debian unstable Uploaded. #724486: libgc - Please sync libgc (main) 1:7.1-7 from Debian unstable main Somebody had already done this independently. Closed. #775703: rsyslog - Please merge rsyslog 5.8.0-1 (main) from debian unstable (main) Needs some fixes; I left review comments. #776279: pbuilder - Please merge pbuilder 0.199+nmu3 (main) from debian unstable (main) Uploaded, with a minor change. #776550: xom - Sync xom 1.2.1-3 (main) from Debian unstable (main) #776551: jansi - Sync jansi 1.4-2 (main) from Debian unstable (main) #776554: libcommons-collections-java - Sync libcommons-collections-java 2.1.1-10 (main) from Debian unstable (main) #776558: tomcat6 - Sync tomcat6 6.0.32-3 (main) from Debian unstable (main) #775820: ocaml - Sync ocaml 3.12.0-5 (main) from Debian unstable (main) Syncs acked. lp:~amoog/ubuntu/oneiric/klibc/lp-775054 Merged. #775794: curl - Please merge curl 7.21.6-1 (main) from debian unstable (main) Uploaded. lp:~maxb/ubuntu/oneiric/preseed/681396-preseed-url-series #681396: preseed - auto url=autoserver fetches wrong preseed file (squeeze, not maverick/natty/oneiric) Arranged for a suitable upstream-based installer branch for this, and merged. #776698: rootskel-gtk - Please merge rootskel-gtk (1.22) from debian unstable Uploaded. == Auto-importer changes (bzr history only) == These happen when the source package as uploaded doesn't quite match the branch (often things like differences in an autogenerated debian/control), or when the branch wasn't properly tagged before upload. I generally follow the rule of thumb that I merge just the history (with 'bzr merge BRANCH; bzr revert .') if the extra history has things like extra contributor credit not reflected in the auto-imported branch, and reject it if it doesn't really add anything substantial. In some cases the branch really does have extra commits not reflected in the auto-import branch (this happens if somebody had committed to lp:ubuntu/foo but not uploaded, and somebody else uploaded something else independently), but I didn't see any cases of that today. lp:~ubuntu-branches/ubuntu/natty/mod-wsgi/natty-201104071155 lp:~ubuntu-branches/ubuntu/natty/gem/natty-201104220303 lp:~ubuntu-branches/ubuntu/natty/tcptrace/natty-201104151309 lp:~ubuntu-branches/ubuntu/natty/xsensors/natty-201104152212 lp:~ubuntu-branches/ubuntu/oneiric/atk1.0/oneiric-201105040311 lp:~ubuntu-branches/ubuntu/oneiric/gobject-introspection/oneiric-201105030811 Rejected. lp:~ubuntu-branches/ubuntu/natty/banshee/natty-201104090814 lp:~ubuntu-branches/ubuntu/natty/ttf-kacst-one/natty-201104111910 lp:~ubuntu-branches/ubuntu/natty/gcc-defaults-armel-cross/natty-201104151410 lp:~ubuntu-branches/ubuntu/oneiric/puppet/oneiric-201105031912 Merged (history only). == General observations == Lots of people are of course doing syncs and merges at the moment. This is great. However, I've seen several cases where people didn't ask the person listed as "touched it last" on merges.ubuntu.com before preparing a merge or a sync; it's happened to both me and Martin Pitt over the last couple of days, at least. As the header of http://merges.ubuntu.com/main.html etc. says: "If you are not the previous uploader, ask the previous uploader before doing the merge. This prevents two people from doing the same work." Please pay attention to this - we don't have so many developers that we can afford to duplicate lots of work. In many cases I've found that if people had asked first then I could have directed them to the correct bzr branch or whatever, and it would have been much quicker to merge their work. Cheers, -- Colin Watson [[email protected]] -- ubuntu-devel mailing list [email protected] Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/ubuntu-devel
