monotone doesn't work
Using ubuntu-8.04 and the stock monotone, (0.37), conflicting merges result in: [EMAIL PROTECTED]> mtn merge mtn: 2 heads on branch 'org.openembedded.dev' mtn: [left] 20d2ef797fd8a37c8d26c6ab510b5a2ee91de387 mtn: [right] 82cafde8c166f8e8f1562f864effd2014be82f96 mtn: help required for 3-way merge mtn: [ancestor] classes/image.bbclass mtn: [left] classes/image.bbclass mtn: [ right] classes/image.bbclass mtn: [ merged] classes/image.bbclass mtn: warning: [string ""]:796: bad argument #2 to 'format' (string expected, got nil) mtn: error: merge failed due to unresolved conflicts This isn't useful and is particularly difficult for a new monotone user to cope with. --rich -- Ubuntu-motu mailing list Ubuntu-motu@lists.ubuntu.com Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/ubuntu-motu
Re: Emanuele Gentili (emgent) is a MOTU!
Wow! you did it before than me! Awesome! Congratulations!!! On Thu, 2008-07-10 at 11:00 +0200, Daniel Holbach wrote: > -BEGIN PGP SIGNED MESSAGE- > Hash: SHA1 > > Hello everybody, > > I'm very pleased to welcome Emanuele Gentili to the MOTU team! > > Working with the Security Team for several months and a clear focus on > other security-related activities got Emanuele a good reputation and > lots of sponsors weighed in on his application. > > Please give him a warm welcome to the team! > > Have a nice day, > Daniel > > - -- > My 5 today: #246804 (vzctl), #246330 (xchat), #246754 (rinse), #246715 > (ubuntu), #244663 (hildon-theme-mobile-basic) > Do 5 a day - every day! https://wiki.ubuntu.com/5-A-Day > -BEGIN PGP SIGNATURE- > Version: GnuPG v1.4.6 (GNU/Linux) > Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org > > iD8DBQFIdc+wRjrlnQWd1esRAk6oAJ91os2pv51pAPLfxgZivJ0CFmw0bgCfaxLl > mQOYYjgzCcfdP+Ciu69gFrM= > =xH2S > -END PGP SIGNATURE- -- aka nxvl Key fingerprint = BCE4 27A0 D03E 55DE DA2D BE06 891D 8DEE 6545 97FE gpg --keyserver keyserver.ubuntu.com --recv-keys 654597FE signature.asc Description: This is a digitally signed message part -- Ubuntu-motu mailing list Ubuntu-motu@lists.ubuntu.com Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/ubuntu-motu
Re: universe-contributors
David Futcher wrote: > I agree that u-u-c's should get more priveleges than plain Ubuntu members as > from what I can see from IRC logs/mailing list archives, it is much easier > to get plain membership than u-u-c status. It shouldn't be especially harder to get membership through u-u-c than through any other method. In any of these cases, the applicant needs to demonstrate both significant and sustained effort working within some (or multiple) areas of the community. One factor that may make u-u-c appear more difficult is that typically only one's contributions within the development community are reviewed, rather than contributions also in other areas. That said, it probably takes longer between application and the granting of membership for u-u-c, but that's in part due to the different process used. -- Emmet HIKORY -- Ubuntu-motu mailing list Ubuntu-motu@lists.ubuntu.com Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/ubuntu-motu
Emanuele Gentili (emgent) is a MOTU!
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Hello everybody, I'm very pleased to welcome Emanuele Gentili to the MOTU team! Working with the Security Team for several months and a clear focus on other security-related activities got Emanuele a good reputation and lots of sponsors weighed in on his application. Please give him a warm welcome to the team! Have a nice day, Daniel - -- My 5 today: #246804 (vzctl), #246330 (xchat), #246754 (rinse), #246715 (ubuntu), #244663 (hildon-theme-mobile-basic) Do 5 a day - every day! https://wiki.ubuntu.com/5-A-Day -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.6 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iD8DBQFIdc+wRjrlnQWd1esRAk6oAJ91os2pv51pAPLfxgZivJ0CFmw0bgCfaxLl mQOYYjgzCcfdP+Ciu69gFrM= =xH2S -END PGP SIGNATURE- -- Ubuntu-motu mailing list Ubuntu-motu@lists.ubuntu.com Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/ubuntu-motu
