I created a script to automate this process. I recommend that this be
included in the branch as to make it easier and to prevent mistakes. Here is
the script:
#!/bin/bash
#Copyright (c) 2010, Jason Cook
#All rights reserved.
> #Redistribution and use in source and binary forms, with or without
> modification, are permitted provided that the following conditions are met:
> #Redistributions of source code must retain the above copyright
> notice, this list of conditions and the following disclaimer.
#Redistributions in binary form must reproduce the above copyright
> notice, this list of conditions and the following disclaimer in the
> documentation and/or other materials provided with the distribution.
#Neither the name of the Jason Cook nor the names of its
> contributors may be used to endorse or promote products derived from this
> software without specific prior written permission.
> #THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
> IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
> THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
> PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
> CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
> EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
> PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
> OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
> WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
> OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
> ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
> #Set Arguments
C=$@
> echo "Released under The BSD License"
> if [ -n "$C" ]; then
echo "CD Ubuntu Manual Directory"
cd ~/Projects/ubuntu-manual
pwd
echo
> echo "Cleaning Directory"
make clean; make
echo
> echo "Pulling from launchpad"
bzr pull
echo
> echo "Commiting Changes"
echo "Comments: $C"
bzr commit -m "$C"
echo
> echo "Pushing changes to launchpad"
bzr push
echo
> echo "Pulling changes from launchpad"
bzr pull
echo
> echo "Finished"
> exit
else
echo "No Comments Specified"
echo "Exiting"
exit
fi
On Tue, May 25, 2010 at 9:38 PM, Elan Kugelmass <epkugelm...@gmail.com>wrote:
> better yet, use bzr commit --fixed=lp:<BUGNUMBER> -m <COMMENT?
>
>
> On Tue, May 25, 2010 at 9:14 PM, Jamin Day
> <jaminday+ubu...@gmail.com<jaminday%2bubu...@gmail.com>
> > wrote:
>
>> Hi Jason,
>>
>> Yes you can fix multiple bugs and then commit/push, rather than doing so
>> after each bug. The commit operation will record any changes you have made
>> across the whole ubuntu-manual branch. Just make sure you list the bug
>> numbers you have addressed in the [comment] when you run bzr commit -m
>> [comment].
>>
>> It would probably be helpful also make the appropriate changes to the
>> bug(s) in launchpad soon after.
>>
>> Cheers,
>>
>> Jamin
>>
>>
>> On Wed, May 26, 2010 at 11:04 AM, Jason Cook <ja...@cookcrew.ca> wrote:
>>
>>> Thanks for this guide. I have just started fixing bugs today and I have a
>>> few questions. Each time you change a bug do you need to "commit and push"
>>> or can you change multiple bugs and then "commit and push".
>>> The command to run are when you make a change are:
>>> cd ~/Projects/ubuntu-manual
>>> make clean; make
>>> bzr pull
>>> bzr commit -m [comment]
>>> bzr push
>>> bzr pull
>>>
>>> On Tue, May 25, 2010 at 7:07 PM, Kevin Godby <god...@gmail.com> wrote:
>>>
>>>> Hello, all.
>>>>
>>>> I wanted to thank everyone who's helped so far with reporting and
>>>> fixing bugs in the manual. We really appreciate it!
>>>>
>>>> Unfortunately, we've had a few new bugs slip in to the code in the
>>>> process. So here's a quick guide on how to commit code for our
>>>> manual:
>>>>
>>>> 1. We're commit our code against the lucid-e2 branch. To get a fresh
>>>> copy of this branch, run:
>>>>
>>>> bzr branch lp:ubuntu-manual/lucid-e2
>>>>
>>>> 2. Once this branch is checked out, you can edit the .tex files
>>>> located in the subdirectories (named after the chapters they contain).
>>>>
>>>> 3. After fixing the bug, run:
>>>>
>>>> make clean; make
>>>>
>>>> This will clear out the old temporary files and PDF and recreate
>>>> them from scratch. This ensures that the manual can be compiled and
>>>> that you haven't made any obvious typos in your LaTeX commands. Do
>>>> not commit your code until you've ensured it compiles successfully.
>>>>
>>>> 3. After compiling the code successfully, *before* you commit, run:
>>>>
>>>> bzr pull
>>>>
>>>> 4. Double-check to make sure your bug is still properly fixed and that
>>>> any changes that were just pulled in were merged properly. (If the
>>>> changes only impacted files you haven't edited, they should be fine.)
>>>>
>>>> 5. Now you can commit your code. Run:
>>>>
>>>> bzr commit
>>>>
>>>> and enter the numbers of any bugs you fixed.
>>>>
>>>> 6. Finally, run:
>>>>
>>>> bzr push
>>>>
>>>> If you've never pushed code to this branch before, bzr will
>>>> complain. You can run:
>>>>
>>>> bzr push lp:ubuntu-manual/lucid-e2
>>>>
>>>> to satisfy it. From that point on, bzr will remember the location
>>>> and you should be able to simply run 'bzr push'.
>>>>
>>>> 7. Run:
>>>>
>>>> bzr pull
>>>>
>>>> to grab the latest code and start again on the next bug.
>>>>
>>>>
>>>> If you take too long between running 'bzr commit' and 'bzr push', you
>>>> may find that someone else has pushed code to the branch. If this
>>>> occurs, run:
>>>>
>>>> bzr uncommit
>>>>
>>>> to undo your commit. Your changes are still in the files, so nothing
>>>> is lost. Then start at step 3 again.
>>>>
>>>> As always, if you have any questions, you can reply to this email or
>>>> chat with us on IRC in #ubuntu-manual on Freenode.
>>>>
>>>> Thanks!
>>>>
>>>> --Kevin Godby
>>>>
>>>> _______________________________________________
>>>> Mailing list: https://launchpad.net/~ubuntu-manual
>>>> Post to : ubuntu-manual@lists.launchpad.net
>>>> Unsubscribe : https://launchpad.net/~ubuntu-manual
>>>> More help : https://help.launchpad.net/ListHelp
>>>>
>>>>
>>>
>>> _______________________________________________
>>> Mailing list: https://launchpad.net/~ubuntu-manual
>>> Post to : ubuntu-manual@lists.launchpad.net
>>> Unsubscribe : https://launchpad.net/~ubuntu-manual
>>> More help : https://help.launchpad.net/ListHelp
>>>
>>>
>>
>> _______________________________________________
>> Mailing list: https://launchpad.net/~ubuntu-manual
>> Post to : ubuntu-manual@lists.launchpad.net
>> Unsubscribe : https://launchpad.net/~ubuntu-manual
>> More help : https://help.launchpad.net/ListHelp
>>
>>
>
_______________________________________________
Mailing list: https://launchpad.net/~ubuntu-manual
Post to : ubuntu-manual@lists.launchpad.net
Unsubscribe : https://launchpad.net/~ubuntu-manual
More help : https://help.launchpad.net/ListHelp
