Saturday, June 16, 2007

aptitude development moves to Mercurial, back to Alioth

Short version: the aptitude development tree is now maintained using Mercurial, go here to fetch it.

aptitude development has been using darcs as a version control system for the last two years. Darcs is a distributed version control system with many great concepts -- but it has one huge, glaring, enormous flaw, which is that innocuous operations, like merging one branch into another, can require practically unbounded amounts of time and space. And once two branches get screwed up in this way, there is nothing, nothing at all, that you can do to get yourself unwedged; the cause is a design flaw in darcs that no-one seems to know how to fix or work around.

Recently, I made the mistake of changing some files in both the Debian branch of aptitude and the head branch, and when I tried to merge the two branches to upload a new upstream release, darcs went off into la-la land. So, I figured that it was probably time to switch version control systems.

I'd like to say that I did extensive research on the matter, but the truth is that I chose Mercurial based on the fact that (A) a lot of ex-darcs users have written nice things about it, (B) git and arch-derived systems always feel ugly to me, and (C) John Goerzen implemented support for mercurial on Alioth. Yes, I am so a follower.

So if you want the up-to-date aptitude source, you should go to http://hg.debian.org/hg/aptitude/head. You can also fetch an RSS feed from http://hg.debian.org/hg/aptitude/head?style=rss.

You can fetch a copy of the repository with "hg clone http://hg.debian.org/hg/aptitude/head aptitude-head". To update, I recommend putting the following lines in ~/.hgrc to enable the "fetch" extension:


[extensions]
hgext.fetch =


Once you've done this, just run "hg fetch" and it should download and merge the latest code. You may want to install kdiff3 to get a better merge tool as well.

To commit a patch locally, run "hg commit". Unfortunately, there doesn't seem to be any easy way for people to send patches back within the VCS like there is for darcs (one of many nice features I had to give up in favor of being able to actually get work done -- what, me bitter?), but it looks like you can get somewhere with "hg bundle <file>", then mailing the resulting file off.

34 Comments:

At 2:06 AM, Anonymous Anonymous said...

You can use the patchbomb extension (the command line is 'hg email ...') to send patches back. I think you can choose to send either bundle+plain text diff, or just plain text diff.

 
At 2:07 AM, Anonymous Anonymous said...

Please don't lump git together with arch. Git has improved significantly in usability, and as of version 1.5 Git easily rivals any other version control system for usability. In particular, many of the tools tell you what you might want to run next ("git status" will almost always provide a logical next step), git-add now works for both new files and new content in an existing file, a nice commit gui git-gui exists, and lots of other usability polishing has occurred.

Alioth works quite well with Git; the Xorg packages use Git with the pkg-xorg Alioth project.

Git makes it far easier to work with multiple branches than mercurial does. Mercurial forces you to have multiple copies of a repository in order to have multiple branches; it enforces a one-working-copy one-branch model. Git allows you to have any number of branches in one repository, and you can create, work with, merge, delete, and rebase branches with incredible speed.

Darcs has worked with Git in the past; in particular, Darcs has an experimental Git repository backend. Many Darcs developers have said good things about Git.

Git has performance as one of its primary design goals. Merging in particular performs incredibly well. Meanwhile, mercurial still has several common operations that require time proportional to the number of commits when they should not.

Git would give you the feature you miss from darcs: integrated patch sending and patch mail application. git-format-patch, git-send-email, and git-am provide everything you need to work with emailed patches. You can also use git-imap-send to drop patch mails in an IMAP drafts folder.

 
At 3:17 AM, Anonymous Anonymous said...

John Goerzen also wrote a plug-in to have a send function similiar to darcs.

"Overview

This extension is used to make it easy to send changesets upstream as bundles.

It works like hg bundle, but integrates attaching the generated bundle into an email. This provides a functionality similar to darcs send.

The result is that a user can simply run "hg send", and Mercurial automatically figures out what changesets are missing remotely and sends them."

http://www.selenic.com/mercurial/wiki/index.cgi/SendExtension

 
At 12:33 PM, Anonymous Anonymous said...

Another new post! Just thinking if anybody has any any links or screenshots of excellent Email
Templates in practice? It certainly is good to see templates, one other thing see examples to
benchmark as good communication. Would be eager to see any
links.

Here is my web site :: email marketing templates

 
At 7:21 PM, Anonymous Anonymous said...

Thanks for sharing your thoughts. I truly appreciate your efforts and
I am waiting for your next write ups thanks once again.

My site ... visit the up coming webpage

 
At 3:42 AM, Anonymous Anonymous said...

I leave a leave a response each time I appreciate
a article on a website or if I have something to valuable to contribute to the discussion.
It's triggered by the sincerness communicated in the article I browsed. And on this post "aptitude development moves to Mercurial, back to Alioth". I was actually excited enough to write a comment :-P I actually do have 2 questions for you if you don't mind.
Is it simply me or does it look like some of the remarks
look like they are coming from brain dead individuals?
:-P And, if you are writing at additional places, I would like to follow you.
Would you list all of your shared sites like your linkedin profile, Facebook page or twitter feed?


Feel free to surf to my blog ... email templates

 
At 6:30 PM, Anonymous Anonymous said...

Hi, its good article concerning media print, we all be familiar with media is a impressive source of data.


Review my web blog - email marketing strategy

 
At 7:51 PM, Anonymous Anonymous said...

If you wish for to increase your knowledge only keep visiting
this website and be updated with the most up-to-date news posted here.


my blog post; simply Click The following internet Page

 
At 8:34 PM, Anonymous Anonymous said...

Thanks in support of sharing such a good idea, paragraph is nice, thats why i have read it entirely

Also visit my page :: bridal makeup tips

 
At 9:35 PM, Anonymous Anonymous said...

What i don't understood is in reality how you're
now not really a lot more neatly-appreciated than you may
be now. You are very intelligent. You understand therefore significantly in terms of this matter,
made me in my view imagine it from a lot of varied angles.

Its like men and women are not fascinated unless it's something to do with Lady gaga! Your personal stuffs great. At all times take care of it up!

My web site: cliff

 
At 9:04 PM, Anonymous Anonymous said...

I was wondering if you ever thought of changing the
structure of your site? Its very well written; I love what youve got to say.
But maybe you could a little more in the way of content so people could connect with
it better. Youve got an awful lot of text for only having one
or 2 images. Maybe you could space it out better?

Visit my website; email marketing templates free

 
At 9:25 AM, Anonymous Anonymous said...

There is definately a lot to find out about this subject.
I love all of the points you've made.

My blog: Full Statement

 
At 11:17 AM, Anonymous Anonymous said...

Whats up are using Wordpress for your site platform?

I'm new to the blog world but I'm trying to get started and set up
my own. Do you need any coding expertise to make your own blog?
Any help would be greatly appreciated!

Also visit my web blog free christmas email templates

 
At 2:44 PM, Anonymous Anonymous said...

Heya just wanted to give you a quick heads up and let you know a few
of the pictures aren't loading correctly. I'm not sure why
but I think its a linking issue. I've tried it in two different internet browsers and both show the same results.

Here is my web blog :: Source website

 
At 3:11 PM, Anonymous Anonymous said...

I don't know if it's just me or if perhaps
everyone else encountering issues with your website.
It appears as though some of the written text on your posts are running off
the screen. Can someone else please comment and let me know if this is happening to them as well?
This could be a issue with my internet browser because
I've had this happen previously. Thanks

my web-site save the date email templates

 
At 6:22 AM, Anonymous Anonymous said...

Have you ever considered about adding a little bit more than just your articles?
I mean, what you say is important and everything. But imagine if you added some great images or videos to give your posts more, "pop"!
Your content is excellent but with pics and video clips, this blog could definitely be one of the best in its niche.
Terrific blog!

Here is my homepage: click through the up coming web site

 
At 8:27 PM, Blogger oakleyses said...

michael kors, nike tn, ralph lauren uk, abercrombie and fitch uk, north face uk, ray ban pas cher, nike free uk, lululemon canada, michael kors, true religion jeans, coach outlet, coach outlet store online, hollister uk, sac longchamp pas cher, vans pas cher, nike blazer pas cher, louboutin pas cher, nike air max uk, michael kors pas cher, nike free run, nike air max uk, new balance, sac hermes, jordan pas cher, true religion outlet, replica handbags, nike roshe, longchamp pas cher, guess pas cher, true religion outlet, north face, polo ralph lauren, coach purses, hollister pas cher, oakley pas cher, timberland pas cher, air max, polo lacoste, nike air force, nike roshe run uk, burberry pas cher, converse pas cher, nike air max, sac vanessa bruno, mulberry uk, hogan outlet, michael kors outlet, true religion outlet, ray ban uk, kate spade

 
At 8:33 PM, Blogger oakleyses said...

doudoune moncler, pandora uk, moncler outlet, vans, converse outlet, montre pas cher, louis vuitton, moncler, moncler, canada goose, canada goose outlet, ugg uk, links of london, barbour uk, supra shoes, replica watches, lancel, nike air max, moncler, moncler, moncler outlet, coach outlet, wedding dresses, canada goose outlet, pandora jewelry, karen millen uk, ugg, marc jacobs, juicy couture outlet, converse, moncler uk, louis vuitton, ugg pas cher, swarovski, pandora jewelry, gucci, canada goose, canada goose uk, ugg,uggs,uggs canada, pandora charms, juicy couture outlet, louis vuitton, louis vuitton, ray ban, ugg,ugg australia,ugg italia, canada goose jackets, swarovski crystal, canada goose, hollister, thomas sabo, canada goose outlet, toms shoes

 
At 7:09 PM, Anonymous Obat Benjolan di Belakang Telinga said...

This information is very useful. thank you for sharing. and I will also share information about health through the website

Cara Mengobati Cacingan
Cara Cepat Mengobati Amandel
Cara Mengobati ruam Kulit pada Bayi
Obat Alami Menurunkan tekanan Darah Tinggi
Obat Penyakit kulit Eksim
Obat Benjolan Di Ketiak
Pengobatan Alami Tuntaskan Keputihan

 
At 12:08 AM, Blogger محمد خاااطر said...


LG صيانة
صيانة اريستون
صيانة فريجيدير
صيانة اريستون
صيانة امريكول
صيانة تكييف كاريير
aeg صيانة
صيانة وايت ويل

 
At 12:15 AM, Blogger carriermaintenance said...

قم الآن بزيارة فرع مركز صيانة توشيبا الاقرب لمنزلك اينما كنت في جمهورية مصر العربية و ذلك حتى تتمكن من الحصول على اقل الاسعار على جميع خدمات صيانة كاريير التي تتمميز بانها يتم اصلاحها في اسرع وقت ممكن باستخدام احدث وسائل صيانة يونيون اير التي توفرها مراكزنا المعتمدة الموجودة في مصر

 
At 1:00 AM, Blogger carriermaintenance said...

بادر الآن بالحصول على اقل الاسعار على جميع خدمات صيانة يونيون اير التي تتم تحت اشراف فريق متخصص من فنيين الصيانة ذوي الخبرة الكبيرة في اصلاح جميع اعطال الاجهزة الكهربائية التي تتواجد في منزلك

 
At 12:16 AM, Blogger toshiba said...

يمكنكم الان التواصل مع خدمة عملاء يونيفرسال المميزة في صيانة الاجهزة الكهربائية التابعة الي خدمة عملاء توشيبا المميزة في خدمة عملاء ال جي اي انهم يعملون علي توفير فريق متخصص في صيانة الاجهزة الكهربائية باعلي جودة ممكتة من مراكز صيانة الكبري

 
At 12:50 AM, Blogger sharp said...

احصل الان علي افضل المميزات من توكيل شارب اي انهمي عملون جيدا وسريعا علي صيانة الاجهزة الكهربئاية الخاصة من توكيل الاسكا العالمي فهم مميزون في الكثير من الامتيازات التي من خلالها الحفاظ علي جميع الخدمات الكبري من توكيل كاريير العالمي والمميز

 
At 12:52 AM, Blogger tecnogasm said...

من خلال توكيل تكنوجاز تستطيع الحصول على أفضل الخدمات التي تعمل على معالجة جميع عيوب الأجهزة و هذا لأننا نعمل من خلال مجموعة من المهندسين و توكيل هايسنس يستخدم أحدث التقنيات و الأساليب المميزة في التعامل مع اعطال و عيوب الأجهزة بجميع أنواعها و توكيل كلفينيتور يضم نخبة من المهندسين و الخبراء في مجال تصليح الأجهزة و توكيل كريازي يرغب في تحقيق الخدمات التي لا مثيل لها و التي تعمل على توفير جميع الإمكانيات لتصليح الاجهزة

 
At 12:56 AM, Blogger توكيل كينوود said...

تعرف ان على افضل الخصومات العالمية التى نقدمة الان فى اقل وقت ممكن من توكيل كينوود التى من خللعهنعمل على تقدم افضل فريق من المتخصصون الان وباقل الاسعار الرائعة من توكيل ماجيك شيف التى تقدمة الشركة الان فى الق وقت ممكن وباقل الاسعار الرائعة من توكيل جليم جاز افضل الاسعارالان فى مصر

 
At 1:09 AM, Blogger carriermaintenance said...

من خلال صيانة كاريير اعتمد على أكفأ فريق من الخبراء في مجال التعامل مع الأجهزة و صيانة سامسونج تعتمد على فريق من الخبراء و المهندسين في العمل و صيانة يونيون اير تجتهد حتى ترضي جميع العملاء و المهندسين في تصليح جميع أنواع الاجهزة الكهربائية

 
At 1:29 AM, Blogger Electrostaragent said...

تواصل الان معنا مع افضل العروض الرائعة التى نقدنمة الان من صيانة الكتروستاركما اننانقدجم اليكم افضل الخدمات العالمية التى لا مثيل لها الن وباقل الاسعار الرائعة ويوجد لدينا الان افضل صيانة فريجيدير التى تقدمة الشركة الان وباقل الاسعار الرائعة حيث اننا نعمل على تقدم فضل صيانة اريستون التىنقدمة الان وباقل الاسعار الرائعة

 
At 4:40 AM, Blogger صيانة said...

يمكنك الحصول على أفضل الخدمات من شركة صيانة كلفينيتور التي تعمل على توفير عمليات معالجة الأجهزة الكهربائية التي تعمل على تحقيق راحتك و صيانة امبريال تعمل من خلال أكفأ الخدمات التي تعمل على معالجة عيوب الأجهزة و صيانة اوشن تضم فريق من الخبراء و المهندسين و صيانة فيلكو تحرص على أن تقدم إليكم الخدمات الأفضل في توفير عمليات تصليح الأجهزة

 
At 11:39 PM, Blogger alaskaeg said...

احصل الان علي ضمان الشامل في صيانة ماجيك شيف لصيانة الاجهزة الكهربئاية باعلي جودة ممكنة اي انهم يعملون علي توفير الكثير من خدمات الخاصة في صيانة جليم جاز فهم مميزون في الكثير من خدمات صيانة الاسكا ويمكنكم الاعتماد عليها في صيانة كريازي العالمية في صيانة التابعة من صيانة المميزة

 
At 10:21 AM, Blogger rehabgad1 said...


Good write-up. I definitely love this site. Keep it up

http://rehabgad.angelfire.com/
http://publish.lycos.com/rehabgad/
https://prokr123.jimdofree.com/
http://sauditechnol.com/
https://www.prokr.net/ksa/jeddah-water-leaks-detection-isolate-companies/

 
At 4:02 AM, Blogger مركز صيانه said...


رقم صيانه البا
رقم صيان دراكي
رقم صيانه دايو
رقم صيانه كرافت
رقم صيانه كارير
رقم صيانه كانون
رقم صيانه كاندي
رقم صيانه كيرا
رقم صيانه بوش

 
At 4:02 AM, Blogger مركز صيانه said...


رقم صيانه هايسينس
رقم صيانه هاير
رقم صيانه جروندج
رقم صيانه جرين
رقم صيانه جودلى
رقم صيانه جي ام سي
رقم صيانه جليم جاز

 
At 4:03 AM, Blogger مركز صيانه said...


رقم صيانه كولدير
رقم صيانه كيننود
رقم صيانه كينمور
رقم صيانه كلفنيتور
رقم صيانه جونكر
رقم صيانه جاك
رقم صيانه انديست

 

Post a Comment

<< Home