On Tue, 2009-10-20 at 14:35 +0200, Patrick Ohly wrote: > With SyncEvolution 0.9.1 beta 2 released and Synthesis having turned > their "unilib" into their official "master" branch it is time to also > switch gears and focus on the upcoming 1.0 release. > > I have made the following changes to our git repos on moblin.org: > * libsynthesis: "syncevolution-0-9-x" is the branch used for the > 0.9.1 release. "master" is now tracking the Synthesis "master" > branch. > * syncevolution: I have created the same "syncevolution-0-9-x" > branch. Before I can replace the "master" branch with "dbus-api" > I need to get translate.moblin.org changed so that it commits > into "syncevolution-0-9-x".
This has been changed. translate.moblin.org is also ready to accept SyncEvolution translations for Moblin >2.1; they are pushed into the master branch. > I merged "master" (= > "syncevolution-0-9-x") into "dbus-api", and the plan is to move > towards that branch without further disruptive rebasing. Done. I merged dbus-api and master branch, making the result the current "master". So if you want to work on SyncEvolution 1.x, please use the "master" branches of libsynthesis and syncevolution. For maintaining SyncEvolution 0.9.1 (like for example, releasing it...), use the "syncevolution-0-9-x" branches. This change was done via git merge and fast-forwards, so it shouldn't disrupt anyone's work. Just make sure that you now follow master instead of dbus-api. Normally the policy is to not add "TODO" remarks to "master" without adding corresponding Bugzilla entries. This rule is relaxed a bit now, because many of TODOs which just entered "master" from the "dbus-api" have already been addressed with code which just needs to be merged. The following command checks which TODOs are still open compared to 0.9.1: git diff syncevolution-0-9-x..master | grep '^\+.*TODO' -- 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
