Konstantinos Margaritis: "Advanced Java EE Development with WildFly" released by Packt (I was one of the reviewers!)
I mentioned this briefly yesterday, but now I'll try to summarize the
story of a great surprise and a big moment for me.
All this started when my wife
Elizabeth and my son Jean-Baptiste wanted to do something special for
my 50th birthday. So, it indeed all started months ago, probably early
March or something (I don't yet have all the details).
Jean-Baptiste described this well on the web site, so I won't go again
into details, but basically, this was about getting birthday
wishes from my "free software family" in, as you might guess, as many
languages as possible.
Elizabeth brought the original idea and JB helped her by setting up
the website and collecting e-mail addresses of people I usually work
with: he grabbed addresses from PO files on Debian website, plus some
in his own set of GPG signatures and here we go. And then he started poking
dozens of you folks in order to get your wishes for this birthday.
Gradually, contributions accumulated on the website, with
many challenges for them: be sure to get as many people as possible,
poking and re-poking all those FLOSS people who keep forgetting
things... It seems that poking people is something that's probably in
the Perrier's genes!
And they were doing all this without me noticing.
As usually in Debian, releasing on time is a no-no. So, it quickly
turned out that having everything ready by April 2nd wouldn't be
possible. So, their new goal was offering this to me on Pentecost
Sunday, which was yesterday. And...here comes the gift.
Aha, this looks like a photo album. Could it be a "50 years of
Christian" album?
But, EH, why is that pic of me, with the red Debconf5 tee-shirt (that
features a world map) and a "bubulle" sign, in front of the book?
But, EH EH EH, what the .... are doing these word by H0lger, then Fil,
then Joey doing on the following pages?
And only then, OMG, I discover the real gift they prepared. 106, often
bilingual, wishes from 110 people (some were couples!). 18 postcards
(one made of wood). 45 languages. One postcard with wishes from nearly every distro
representatives at LinuxTag 2011. Dozens of photos from my friends all
around the world. All this in a wonderful album.
I can't tell what I said. Anyway, JB was shooting a video, so...we'll see. OK, I didn't cry...but it wasn't that far and
emotion was really really intense.
Guys, ladies, gentlemen, friends....it took me a while to realize what
you contributed to. It took me the entire afternoon to realize the
investment put by Elizabeth and JB (and JB's sisters support) into
this. Yes, as many of you wrote, I have an awesome family and they
really know how to share their love. I also have an awesome virtual
family all around the world. Your words are wholeheartedly appreciated
and some were indeed much much much appreciated.
Of course, I'll have the book in Banja Luka so that you can see the
result. I know (because JB and Elizabeth told me) that many of you
were really awaiting to see how it would be received (yes, that
includes you, in Germany, who I visited in early May!!!).
Again, thank you so much for this incredible gift. Thank you Holger Levsen, Phil Hands, Joey Hess, Lior Kaplan, Martin
Michlmayr, Alberto Gonzalez Iniesta, Kenshi "best friend" Muto,
Praveen Arimbrathodiyil, Felipe Augusto van de Wiel, Ana Carolina
Comandulli (5 postcards!), Stefano Zacchiroli (1st contribution
received by JB, of course), Gunnar Wolf, Enriiiiiico Zini, Clytie Siddall,
Frans Pop (by way of Clytie), Tenzin Dendup, Otavio Salvador, Neil
McGovern, Konstantinos Margaritis, Luk Claes, Jonas Smedegaard, Pema
Geyleg, Meike "sp tzle queen" Reichle, Alexander Reichle-Schmehl,
Torsten Werner, "nette BSD" folks, CentOS Ralph and
Brian, Fedora people, SUSE's Jan, Ubuntu's Lucia Tamara, Skolelinux'
Paul, Rapha l Hertzog, Lars Wirzenius, Andrew McMillan (revenge in
September!), Yasa Giridhar Appaji Nag (now I know my name in Telugu),
Amaya Rodrigo, St phane Glondu, Martin Krafft, Jon "maddog" Hall (and
God save the queen), Eddy Petri or, Daniel Nylander, Aiet Kolkhi,
Andreas "die Katze geht in die K che, wunderbar" Tille, Paul "lets
bend the elbow" Wise, Jordi "half-marathon in Banja Luka" Mallach,
Steve "as ever-young as I am" Langasek, Obey Arthur Liu, YAMANE
Hideki, Jaldhar H. Vyas, Vikram Vincent, Margarita "Bronx
cross-country queen" Manterola, Patty Langasek, Aigars Mahinovs
(finding a pic *with* you on it is tricky!), Thepittak
Karoonboonyanan, Javier "nobody expects the Spanish inquisition"
Fern ndez-Sanguino, Varun Hiremath, Moray Allan, David Moreno Garza,
Ralf "marathon-man" Treinen, Arief S Fitrianto, Penny Leach, Adam
D. Barrat, Wolfgang Martin Borgert, Christine "the mentee overtakes
the mentor" Spang, Arjuna Rao Chevala, Gerfried "my best contradictor"
Fuchs, Stefano Canepa, Samuel Thibault, Eloy "first samba maintainer"
Par s, Josip Rodin, Daniel Kahn Gillmor, Steve McIntyre, Guntupalli
Karunakar, Jano Gulja , Karolina Kali , Ben Hutchings, Matej Kova i ,
Khoem Sokhem, Lisandro "I have the longest name in this list" Dami n
Nicanor P rez-Meyer, Amanpreet Singh Alam, H ctor Or n, Hans
Nordhaugn, Ivan Mas r, Dr. Tirumurti Vasudevan, John "yes, Kansas is
as flat as you can imagine" Goerzen, Jean-Baptiste "Piwet" Perrier,
Elizabeth "I love you" Perrier, Peter Eisentraut, Jesus "enemy by
nature" Climent, Peter Palfrader, Vasudev Kamath, Miroslav "Chicky"
Ku e, Mart n Ferrari, Ollivier Robert, Jure uhalev, Yunqiang Su,
Jonathan McDowell, Sampada Nakhare, Nayan Nakhare, Dirk "rendez-vous
for Chicago marathon" Eddelbuettel, Elian Myftiu, Tim Retout, Giuseppe
Sacco, Changwoo Ryu, Pedro Ribeoro, Miguel "oh no, not him again" Figueiredo, Ana Guerrero,
Aur lien Jarno, Kumar Appaiah, Arangel Angov, Faidon Liambotis, Mehdi
Dogguy, Andrew Lee, Russ Allbery, Bj rn Steensrud, Mathieu Parent,
Davide Viti, Steinar H. Gunderson, Kurt Gramlich, Vanja Cvelbar, Adam
Conrad, Armi Be irovi , Nattie Mayer-Hutchings, Joerg "dis shuld be
REJECTed" Jaspert and Luca Capello.
Let's say it gain:
I mentioned this briefly yesterday, but now I'll try to summarize the
story of a great surprise and a big moment for me.
All this started when my wife
Elizabeth and my son Jean-Baptiste wanted to do something special for
my 50th birthday. So, it indeed all started months ago, probably early
March or something (I don't yet have all the details).
Jean-Baptiste described this well on the web site, so I won't go again
into details, but basically, this was about getting birthday
wishes from my "free software family" in, as you might guess, as many
languages as possible.
Elizabeth brought the original idea and JB helped her by setting up
the website and collecting e-mail addresses of people I usually work
with: he grabbed addresses from PO files on Debian website, plus some
in his own set of GPG signatures and here we go. And then he started poking
dozens of you folks in order to get your wishes for this birthday.
Gradually, contributions accumulated on the website, with
many challenges for them: be sure to get as many people as possible,
poking and re-poking all those FLOSS people who keep forgetting
things... It seems that poking people is something that's probably in
the Perrier's genes!
And they were doing all this without me noticing.
As usually in Debian, releasing on time is a no-no. So, it quickly
turned out that having everything ready by April 2nd wouldn't be
possible. So, their new goal was offering this to me on Pentecost
Sunday, which was yesterday. And...here comes the gift.
Aha, this looks like a photo album. Could it be a "50 years of
Christian" album?
But, EH, why is that pic of me, with the red Debconf5 tee-shirt (that
features a world map) and a "bubulle" sign, in front of the book?
But, EH EH EH, what the .... are doing these word by H0lger, then Fil,
then Joey doing on the following pages?
And only then, OMG, I discover the real gift they prepared. 106, often
bilingual, wishes from 110 people (some were couples!). 18 postcards
(one made of wood). 45 languages. One postcard with wishes from nearly every distro
representatives at LinuxTag 2011. Dozens of photos from my friends all
around the world. All this in a wonderful album.
I can't tell what I said. Anyway, JB was shooting a video, so...we'll see. OK, I didn't cry...but it wasn't that far and
emotion was really really intense.
Guys, ladies, gentlemen, friends....it took me a while to realize what
you contributed to. It took me the entire afternoon to realize the
investment put by Elizabeth and JB (and JB's sisters support) into
this. Yes, as many of you wrote, I have an awesome family and they
really know how to share their love. I also have an awesome virtual
family all around the world. Your words are wholeheartedly appreciated
and some were indeed much much much appreciated.
Of course, I'll have the book in Banja Luka so that you can see the
result. I know (because JB and Elizabeth told me) that many of you
were really awaiting to see how it would be received (yes, that
includes you, in Germany, who I visited in early May!!!).
Again, thank you so much for this incredible gift. Thank you Holger Levsen, Phil Hands, Joey Hess, Lior Kaplan, Martin
Michlmayr, Alberto Gonzalez Iniesta, Kenshi "best friend" Muto,
Praveen Arimbrathodiyil, Felipe Augusto van de Wiel, Ana Carolina
Comandulli (5 postcards!), Stefano Zacchiroli (1st contribution
received by JB, of course), Gunnar Wolf, Enriiiiiico Zini, Clytie Siddall,
Frans Pop (by way of Clytie), Tenzin Dendup, Otavio Salvador, Neil
McGovern, Konstantinos Margaritis, Luk Claes, Jonas Smedegaard, Pema
Geyleg, Meike "sp tzle queen" Reichle, Alexander Reichle-Schmehl,
Torsten Werner, "nette BSD" folks, CentOS Ralph and
Brian, Fedora people, SUSE's Jan, Ubuntu's Lucia Tamara, Skolelinux'
Paul, Rapha l Hertzog, Lars Wirzenius, Andrew McMillan (revenge in
September!), Yasa Giridhar Appaji Nag (now I know my name in Telugu),
Amaya Rodrigo, St phane Glondu, Martin Krafft, Jon "maddog" Hall (and
God save the queen), Eddy Petri or, Daniel Nylander, Aiet Kolkhi,
Andreas "die Katze geht in die K che, wunderbar" Tille, Paul "lets
bend the elbow" Wise, Jordi "half-marathon in Banja Luka" Mallach,
Steve "as ever-young as I am" Langasek, Obey Arthur Liu, YAMANE
Hideki, Jaldhar H. Vyas, Vikram Vincent, Margarita "Bronx
cross-country queen" Manterola, Patty Langasek, Aigars Mahinovs
(finding a pic *with* you on it is tricky!), Thepittak
Karoonboonyanan, Javier "nobody expects the Spanish inquisition"
Fern ndez-Sanguino, Varun Hiremath, Moray Allan, David Moreno Garza,
Ralf "marathon-man" Treinen, Arief S Fitrianto, Penny Leach, Adam
D. Barrat, Wolfgang Martin Borgert, Christine "the mentee overtakes
the mentor" Spang, Arjuna Rao Chevala, Gerfried "my best contradictor"
Fuchs, Stefano Canepa, Samuel Thibault, Eloy "first samba maintainer"
Par s, Josip Rodin, Daniel Kahn Gillmor, Steve McIntyre, Guntupalli
Karunakar, Jano Gulja , Karolina Kali , Ben Hutchings, Matej Kova i ,
Khoem Sokhem, Lisandro "I have the longest name in this list" Dami n
Nicanor P rez-Meyer, Amanpreet Singh Alam, H ctor Or n, Hans
Nordhaugn, Ivan Mas r, Dr. Tirumurti Vasudevan, John "yes, Kansas is
as flat as you can imagine" Goerzen, Jean-Baptiste "Piwet" Perrier,
Elizabeth "I love you" Perrier, Peter Eisentraut, Jesus "enemy by
nature" Climent, Peter Palfrader, Vasudev Kamath, Miroslav "Chicky"
Ku e, Mart n Ferrari, Ollivier Robert, Jure uhalev, Yunqiang Su,
Jonathan McDowell, Sampada Nakhare, Nayan Nakhare, Dirk "rendez-vous
for Chicago marathon" Eddelbuettel, Elian Myftiu, Tim Retout, Giuseppe
Sacco, Changwoo Ryu, Pedro Ribeoro, Miguel "oh no, not him again" Figueiredo, Ana Guerrero,
Aur lien Jarno, Kumar Appaiah, Arangel Angov, Faidon Liambotis, Mehdi
Dogguy, Andrew Lee, Russ Allbery, Bj rn Steensrud, Mathieu Parent,
Davide Viti, Steinar H. Gunderson, Kurt Gramlich, Vanja Cvelbar, Adam
Conrad, Armi Be irovi , Nattie Mayer-Hutchings, Joerg "dis shuld be
REJECTed" Jaspert and Luca Capello.
Let's say it gain:
svn-all-fast-export --identity-map authors.txt --rules pkg-ace.rules svn-pkg-aceHere's the content of the pkg-ace.rules configuration file that was used:
create repository pkg-ace end repository match /trunk/ repository pkg-ace branch master end match match /(branches tags)/([^/]+)/ repository pkg-ace branch \2 end matchThe author mapping file authors.txt being:
markos = Konstantinos Margaritis <email-hidden> mbrudka-guest = Marek Brudka <email-hidden> pgquiles-guest = Pau Garcia i Quiles <email-hidden> tgg = Thomas Girard <email-hidden> tgg-guest = Thomas Girard <email-hidden>The tool sample configuration file merged-branches-tags.rules recommends to post-process tags, which are just a branch in SVN. That's why the configuration file above treats branches as tags. The conversion was indeed fast: less than 1 minute.
svn tags as branches:
Branches are marked with green rectangles, and tags with yellow arrows.
What we have here (expected given our configuration of the tool) are
branches (e.g. 5.4.7-5) corresponding to tags, and tags matching the SVN
tagging commit (e.g. backups/5.4.7-5@224). We'll review and fix this.
merged code that did not appear as such:
Branches that were not merged using svn merge look like they were not
merged at all.
commits with wrong author:
Before being in SVN, the repository was stored in CVS. When it was imported
into SVN, no special attention was given to the commit author. Hence I
got credited for changes I did not write.
obsolete branches:
The tool leaves all branches, including removed ones (with tag on their end)
so that you can decide what to do with them.
missing merges:
The branch 5.4.7-12 was never merged into the trunk!
#!/usr/bin/env ruby # # retag.rb # # Small script to create an annotated tag, specifying commiter as well as # date, and tag comment. # # Based on Scott Chacon "Custom Importer" example. # # Arguments: # $1 -- tag name # $2 -- sha-1 revision to tag # $3 -- committer in the form First Last <email> # $4 -- date to use in the form YYYY/MM/DD_HH:MM:SS def help puts "Usage: retag <tag> <sha1sum> <committer> <date> <comment>" puts "Creates a annotated tag with name <tag> for commit <sha1sum>, using " puts "given <committer>, <date> and <comment>" puts "The output should be piped to git fast-import" end def to_date(datetime) (date, time) = datetime.split('_') (year, month, day) = date.split('/') (hour, minute, second) = time.split(':') return Time.local(year, month, day, hour, minute, second).to_i end def generate_tag(tag, sha1hash, committer, date, message) puts "tag # tag " puts "from # sha1hash " puts "tagger # committer # date +0000" print "data # message.size \n# message " end if ARGV.length != 5 help exit 1 else (tag, sha1sum, committer, date, message) = ARGV generate_tag(tag, sha1sum, committer, to_date(date), message) end
me@mymachine$ echo 6a6d48814d0746fa4c9f6869bd8d5c3bc3af8242 11cf74d4aa996ffed7c07157fe0780ec2224c73e 898ad49b61d4d8d5dc4072351037e2c8ade1ab68 >> .git/info/grafts
#!/bin/sh br="HEAD" TARG_NAME="Raphael Bossek" TARG_EMAIL="hidden" export TARG_NAME TARG_EMAIL filt=' if test "$GIT_COMMIT" = 546db1966133737930350a098057c4d563b1acdf -o \ "$GIT_COMMIT" = 23419dde50662852cfbd2edde9468beb29a9ddcc; then if test -n "$TARG_EMAIL"; then GIT_AUTHOR_EMAIL="$TARG_EMAIL" export GIT_AUTHOR_EMAIL else unset GIT_AUTHOR_EMAIL fi if test -n "$TARG_NAME"; then GIT_AUTHOR_NAME="$TARG_NAME" export GIT_AUTHOR_NAME else unset GIT_AUTHOR_NAME fi fi ' git filter-branch $force --tag-name-filter cat --env-filter "$filt" -- $br(Script edited here; there were much more commits written by Raphael.)
Important
It's important to realize that the whole selected branch history is rewritten, so all objects id will change. You should not do this if you already published your repository.
Hint
Once git filter-branch completes you get a new history, as well as a new original ref to ease comparison. It is highly recommended to check the result of the rewrite before removing original. To shrink the repo after this, git clone the rewritten repo with file:// syntax -- git-filter-branch says it all.
Add graft points where needed.
Clean tags and branches. Using git tag -d, git branch -d and the Ruby script above it was possible to recreate tags. During this I was also able to add missing tags, and remove some SVN errors I did -- like committing in a branch created under tags/.
Remove obsolete branches.
Merge missing pieces. There were just two missing debian/changelog entries. I did this before git filter-branch because I did not find a way to use the tool correctly with multiple heads.
Fix commit author where needed. Using the shell script above Raphael is now correctly credited for his work.
| [1] | http://lists.alioth.debian.org/pipermail/pkg-ace-devel/2011-March/002421.html |
| [2] | available in Debian as svn-all-fast-export |
Quite a few things have happened recently in the Debian/ARM land