[ Dekstop Help ] First Contributions - Lesson Learned

[Greg Beam]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Hi Stephen,

Thanks for your comments. Pse see my comments below.

On 01/12/2014 07:59 AM, Stephen M. Webb wrote:
> On 01/12/2014 04:35 AM, Greg Beam wrote:
> 
>> - Repository Tab: ----------------- * This page needs an
>> overhaul. It uses Natty and Karmic as examples, and points users
>> to Apps >> Accessories >> Terminal. That should have sounded
>> alarm bells, but it didn't. Blunder #1 on my part.
> 
> /self grumbles about too many unmaintained web pages on
> Ubuntu.com...
> 
>> * The biggest issue was local repository setup methodology. Long
>> story short, if we use the Advanced method, which is recommended
>> in the standard method section to speed up downloads, one can
>> only a single MP or bzr bundle at a time. This was not obvious to
>> me at the time. Those new to working in bzr or in a bzr
>> Distributed + Gatekeeper work flow may or may not put that
>> together.
> 
> The Bazaar terminology is 'branch.'  You can only work on a single
> branch at a time.  This is identical to other distributed version
> control systems, like git.  The difference is that without using
> Bazaar plugins, each branch is a separate directory on your
> filesystem.  Git and Mercurial allow you to work on separate
> branches in the same directory by providing a virtual filesystem
> that can be swapped in and out.

- -----
Yes, I need to learn allot more about bzr for sure. I suppose my main
point was, we should structure the Wiki in such a way that it explains
how to set up and maintain things for use with ubuntu-docs
specifically, as each project has it's own why of doing things. Maybe
examples on the Wiki for branching, merging and working multiple
issues would be helpful. A visual work-flow would be useful too.
- -----

> 
> There is good Bazaar documentation on this [1].  Is it not linked
> from the Wiki page?
> 
>> * Only after several long conversations in IRC, I finally figured
>> out I was causing all sorts of problems for the commiters, and
>> sending the wrong data to launchpad.
> 
>> knome gave me a solution that works. Further discussion with
>> godbyk confirmed it to be a commonly used. The work around is as
>> follows:
> 
>> .. bzr branch lp:ubuntu-docs .. cp -R ./ubuntu-docs
>> ./ubuntu-docs-lp12345 .. cd ubuntu-docs-lp12345 .. do work .. ..
>> commit --fixes lp:12345 -F "./commit-notes.txt" .. bzr push
>> lp:~ki7mt/ubuntu-docs/lp1234-fix
> 
> The only problem with that workflow is that you're trying to
> subvert Bazaar.  It's better to do this:
> 
> bzr branch lp:ubuntu-docs ubuntu-docs-lp12345 cd
> ubuntu-docs-lp12345 do work ... commit --fixes lp:12345 -F
> "./commit-notes.txt" bzr push lp:~ki7mt/ubuntu-docs/lp1234-fix

- -----
I was using that method initially. I followed the Wiki and created a
shared ubuntu-bzr repo. When I added commits to the second branch
ubuntu-docs-lp6789-fix then further pushed the MP, it caused problems.

knome also told me to do bzr pull from time to time an make sure
ubuntu-docs-base was up to date before cp -R. I forgot to add that part.
- -----

> Why not check out once and copy?  Because in the mean time someone
> could have checked in changes to lp:ubuntu-docs and you would be
> working from a stale branch.  You could even end up overwriting
> someone else's changes, although Bazaar is pretty good about
> preventing that, forcing you to go back and redo everything with a
> fresh checkout anyway.  Always start with a fresh checkout.  On
> busy projects (ones with more than one active developer), I usually
> merge from Launchpad again before create a merge proposal in case
> the branches have diverged.

- -----
Yes, I check bzr update regularly, I just did not state it.
- -----

> 
> If you need to reduce bandwidth, you can use --lightweight to not
> copy history.

- ----
They may be an option as well, I need to read more on that.
- ----

> [1]
> http://doc.bazaar.canonical.com/latest/en/user-guide/branching_a_project.html
>
> 
> 
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.15 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/

iQEcBAEBAgAGBQJS0tsTAAoJEAmfcyeKlj0xuZgIAO2QYXPFkErZ/3RytDXk/WRT
m30eFQWwZmyddD2tpeniZB+SUxX4koJ7/eN39oNa/zYX07oQusMS/rdjsl/wNagt
oZdpDPrXtuVH3pNdggaDAZhsSrnn5AvttfLB+LJLT3ubDrU38Ih03wyyd/rMbhs8
8yL8E32MiWNs0jgMkL7a4+oFf6eutqJdqB14PAi/ptfgfQLDviHiGuYngSFagnXY
VEh6aNz8gC6P9+UXW/Gk1KeDzgt9Uxx7P8HYsb9lx1W76gg5FMccAbTQQZThJV7m
xYoN+PP7yX/H/YP1AG3kTIHsvVk6ccoS5OVok1a5vCkZPoo6jxJM6BNcoaEpO1g=
=Oezo
-----END PGP SIGNATURE-----