On So, 2011-03-27 at 14:13 +0100, Patrick Ohly wrote: > Can you prepare a patch series that targets the current master branch? > Please keep my initial patches unmodified (expect for rebasing). > Split up the changes into self-contained pieces as much as possible, > with explanations of what each piece is about (problem, motivation) and > how the problem is solved (overview, details in the code).
As discussed on chat, Dinesh pushed his rebased branch to his repo (akonadi-merge). I then cleaned it up by squashing and reordering commits until at the end each commit is clean and somewhat self-contained. Dinesh, I pushed the result as akonadi-merge-pohly. A git diff akonadi-merge-pohly..saidinesh5/akonadi-merge shows that the end result is almost the same as your code. Main diffs are because I solved the ".gitignore" part slightly differently and my "master" based is a bit more recent. Can you check that the commit messages still make sense? Did I make some mistake somewhere along the line? Do you think the auto-detection of KWallet vs. GNOME keyring [1] is properly solved? [1] https://bugs.meego.com/show_bug.cgi?id=691 I haven't done any kind of serious code review of the cleaned up patch series yet. For that I'd like to wait for an okay from you that I shall go ahead with this revision. -- Best Regards, Patrick Ohly The content of this message is my personal opinion only and although I am an employee of Intel, the statements I make here in no way represent Intel's position on the issue, nor am I authorized to speak on behalf of Intel on this matter. _______________________________________________ SyncEvolution mailing list [email protected] http://lists.syncevolution.org/listinfo/syncevolution
