[Aptitude-devel] The Merge of Doom has taken place.

[Daniel Burrows]

  Hi all,

daniel at emurlahn:~/programming/aptitude/head$ hg log -r tip
changeset:   2611:c81f562751d6
tag:         tip
parent:      1665:94b597a663a7
parent:      2610:78100f86756d
user:        Daniel Burrows <dburrows at debian.org>
date:        Mon Mar 23 10:49:47 2009 -0700
summary:     Merge the entire post-lenny branch into head.

  I've merged the post-lenny branch into "head".  aptitude development
is now taking place at <http://hg.debian.org/aptitude/head>
exclusively.  Please update your .hg/hgrcs accordingly. :-)

  I tried to take translations from the "head" branch exclusively.  If
I messed up, or if you needed a translation from the "post-lenny"
branch, you can retrieve the old files from the parent revisions:

$ hg update -r 94b597a663a7 <file>   # get <file> from the old "head"
$ hg update -r 78100f86756d <file>   # get <file> from the old "post-lenny"

  Of course, any other "hg" command (like "cat") will also work with
those revision IDs.

  And for extra fun, add

[extensions]
hgext.hgk =

  to ~/.hgrc and run "hg view" to see the merge in all its g(l)ory. ;-)

  Daniel