bzr push

[Jim Campbell]

Hey Dan,

On Tue, Sep 21, 2010 at 12:06 AM, Dan 'Da Man' <heymrdjd at gmail.com> wrote:

> I am an occasional Xubuntu user and I will what I can to look over the
> docs and revised
> what I catch.
>
> I have a question about the patches/bugs I have been
> submitting.  All of them originated from Xubuntu 10.10 docs and that is
> stated in the patches and bugs, but I see that you merged the changes
> to the Natty branch.  I know that there is a pre-release freeze on
> 10.10  docs, but how else should I differentiate which patches/bugs
> are intended to their respective branch?
>

Thanks so much for taking the initiative on this.

At this point in time, the Maverick and Natty branches should be the same.
If you have any pending changes, the best way for me to notice them is to
submit the patch to the mailing list like you did before.  You can follow
Matthew's instructions for noting that your updates fix a particular bug,
though.

I will apply those updates to the Natty branch.  I'm not as much of a bzr
guru, so if it were me, after I have applied your pending updates I would
recommend that you just pull a fresh repository of the Xubuntu Natty
branch.  You could then follow Matthew's instructions for keeping a separate
branch of the Natty docs.

Also, your last patch was valid, but do you know how to validate your
changes before you commit them?  Currently, on the xubuntu docs, there is a
scripts folder that contains a validate.sh script.  You would need to run
something like ./validate.sh ../desktopguide/index.xml to validate the
xubuntu doc set (I don't have the repository available on this computer).
(Because of how Xubuntu docs are set up, an individual file may come up as
invalid, even though the entire doc set is valid. Thus, we validate against
the index.xml file.)  You should only get errors that are related to your
changes, but if someone else didn't validate their own docs, and they have
an error in what they have committed, then you may find errors in other
document files.

If you find an error, try to correct it, and then re-validate the docs.  If
you get stuck on any error, feel free to ask on the mailing list, or ask
someone on IRC.

Also, once we get a good sampling of your work, we will see about giving you
commit access.  Thanks again for your efforts!!

Jim
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.ubuntu.com/archives/ubuntu-doc/attachments/20100922/841ae00c/attachment.html>