As I’m sure is the case with other Ubuntu-related development groups, the Xubuntu team has been quite active as of late. We spent some time this weekend testing out configurations of system settings now that we have migrated to Xfce 4.6 for the 9.04 release, and have completed the transition to the new artwork for the release, too. Much of these discussions took place over IRC, and it was fun to be a part of it. We were able to hammer out patches, test them out, and then provide feedback to each other based on our findings. The time spent proved to be very beneficial, and the Xubuntu 9.04 release is shaping up very nicely.
I’ve also been working on the documentation for Xubuntu 9.04, which has been rebased off of the Ubuntu 9.04 documentation for this release. What this means is that I’ve been able to use bzr to merge in changes from the Ubuntu documentation as they happen, applying them directly to the current branch of Xubuntu documentation. This is different from prior Xubuntu documentation efforts that had been based off of a much earlier set of Ubuntu docs.
In that sense, I was starting at a bit of a disadvantage - each release brings changes and updates, not only to X/K/Ubuntu itself, but also the associated documentation. However, by using the current branch of Ubuntu docs as a starting point for this release, and merging in updates as they get applied to Ubuntu documentation, I’ve been able to leverage the ongoing contributions of the Ubuntu documentors and keep the Xubuntu docs more up-to-date.
Using this approach took a little bit of experimenting to find a good workflow for myself, but Bzr has proved to be a more-than-adequate tool for this particular scenario. For example, the bzr command that I’ve used most frequently as of late involves merging in the specific changes from one Ubuntu documentation revision to another into the Xubuntu documentation branch. To do that, I’ve just reviewed recent changes to Ubuntu documentation, navigated to my local folder of the Xubuntu documentation branch, and issued a command similar to this one:
bzr merge -r211..212 lp:ubuntu-doc
Here I’m telling bzr to merge in only the differences between revisions number 211 and 212 from the Ubuntu Documentation branch. Merging in changes between specific revision numbers allows me to cherrypick - I can merge the changes that I want, and skip the changes that I don’t want. This is helpful because Xubuntu docs will not include the Ubuntu Server Guide (my apologies to Adam Sommer, who has done a ton of great work on the Ubuntu Server Guide for this release), so I have skipped revisions that include updates to the Server Guide. : /
If there are no conflicts between the merged files, bzr just identifies the changes as modified files - no problems. Files that contain conflicts are identified by bzr, too, and it is up to me to resolve those conflicts. Once fixed, I can then use bzr to mark the conflicts as resolved. The process still requires some manual review on my part, but reviewing someone else’s changes is much easier than writing my own stuff, and gives me more time to focus on documenting the elements that are specific to Xubuntu.
I’m still writing additional documentation that is specific to Xubuntu, but have a little bit of time remaining before string freeze. : ) At the end of next week, I am going to be travelling to Seattle to visit a friend and her husband, and also attend a documentation conference out there. I’m going to focus on the Design Strategies, Content Development, and Open Standards tracks. It should be a great time, and should make for a great learning experience, too.