MoM is running

[Scott James Remnant]

MoM is currently doing the first official run over the archive, it may
have finished by the time you read this, or it may have choked on
another corner case somewhere.

Either way, there's plenty of output to get chewing on.

E-mails/bugs aren't being sent out just yet (got to improve my Malone
driver) so merges need to be taken manually for now. Go to:

	http://merges.ubuntu.com/

And begin working on any packages that are nominally "yours".  There's a
script there to download things for you if you want.


NOTE

This is a new MoM, and hopefully this matches what you've all been
asking for.  Make sure you read the REPORT file for the merge to
understand what's happened.

Basically speaking:

 * If there are no problems with the merge, you are given a source
   package and a new patch-from-debian -- make sure that's sane, if so,
   generate a changes file, sign and upload

 * If conflicts/problems occur, you are given a tarball instead.  Inside
   this tarball you'll find the "unpacked" source.  The REPORT lists the
   files that have problems.

   - Files marked 'C ' have diff3 conflict markers in them, edit them
     with the editor of your choice (I recommend emacs and smerge-mode)

   - Files marked 'C*' have a .UBUNTU and .DEBIAN version on disk,
     resolve by renaming one and deleting the other -- or combining them
     however you see fit

 * There's no "winning" patch or dropped hunks file anymore, where
   things would have been dropped, a conflict is created instead

Scott
-- 
Scott James Remnant
scott at ubuntu.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 191 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/ubuntu-devel/attachments/20060628/08755409/attachment.pgp