Hi, * Matthew East: > Hi all, > > * Shaun McCance: >> On Sun, 2007-07-15 at 03:31 +1200, Matthew Paul Thomas wrote: >>> On Jul 5, 2007, at 7:30 PM, Matthew East wrote: >>>> ... >>>> The basic problem we are having though is that Ubuntu customises quite >>>> a lot of Gnome, and as a result the Gnome documentation is wrong, and >>>> we need to correct it. An example is the layout of the System menu, >>>> which in Ubuntu does not contain the screenshot/lockscreen buttons, >>>> but which are part of vanilla Gnome and therefore documented in the >>>> Gnome user guide. >>>> ... >>> There is a third way: Use distributed version control. >>> >>> The GDP could have its own branch, Ubuntu could have its own branch, >>> and any other distributor that used a customized Gnome could have its >>> own branch. Ubuntu could merge any useful changes from the GDP, while >>> ignoring those that weren't relevant to Ubuntu. The GDP could merge any >>> useful changes from Ubuntu, while ignoring those that apply to >>> Ubuntu-specific customizations. And if two or more distributors made >>> the same customizations, they could merge corresponding documentation >>> changes from each other. > > This is an interesting idea. I'd very much like to find out how easy it > is to merge/reject different changes from a branch while maintaining a > patch. ... > Ok, let's give this a go. I've arranged an import from svn to bzr > through Launchpad's semi-automatic feature: > > https://code.launchpad.net/~vcs-imports/gnome-user-docs/trunk > > The next step would be to try to create an Ubuntu-customised branch, and > to try and merge any updates coming into upstream which don't conflict > with such changes on a regular basis. I don't know much about how bzr > works so hopefully mpt will help out with that. Right, I've created a branch which can potentially be used for Ubuntu customisations. It can be found here: https://code.launchpad.net/~ubuntu-doc/gnome-user-docs/ubuntu-changes If anyone wants to roll with the idea and play around, members of the "ubuntu-doc" team can checkout and commit, and of course, anyone else can create another branch or a patch. As yet I don't have any idea: 1. How to go about packaging gnome-user-docs in Ubuntu from the Ubuntu branch - I'm hoping Daniel will help with this when he is back from holiday. 2. How easy/difficult it will be to merge Gnome upstream changes into the Ubuntu branch. So please bear with me - I'm totally new to bzr... Matt -- http://www.mdke.org gnupg pub 1024D/0E6B06FF
Attachment:
signature.asc
Description: OpenPGP digital signature