Question about features

Maarten Bosmans mkbosmans at gmail.com
Tue Nov 3 11:16:50 GMT 2009


2009/11/3 Daniel Carrera <dcarrera at gmail.com>:
> On Tue, Nov 3, 2009 at 11:34 AM, Maarten Bosmans <mkbosmans at gmail.com> wrote:
>> Another nice way of working is something I believe is called 'daggy
>> fixes', or something like that. When you want to fix a bug, you branch
>> from the point the bug was introduced into the mainline and merge that
>> bugfix branch back into the mainline.
>
> That is completely impractical. I am developing a new site, and
> chances are that any bug I find was there from the beginning.
> Furthermore, it seems like needless hassle to go look for the revision
> that introduced that line, and for what purpose? I just want to fix
> the bug.

For developing a website this is indeed not really a good approach.
You can view my remarks in the light of a software development
process, where one would have multiple active branches corresponding
to different maintenance and development releases. In this scenario it
really helps to know all the branches that need the bugfix.

You would probably have just one release: the live website. In this
case you can just commit to the mainline (trunk) of your project. Note
that developing new features in separate branches from the mainline is
really useful in this scenario too, because you can push (upload) the
mainline directly after the bugfix commit. You now have a live website
with the bugfix, but without your halfway done feature.

2009/11/3 Daniel Carrera <dcarrera at gmail.com>:
> I meant to send this to the list earlier:
>
> I just read the documentation for "shelve". It looks very neat - you
> can shelve multiple sets of changes and unshelve them in any order.
> Another interesting feature for me is the upload plugin. I'm a web
> developer, my work flow is:
>
> 1. Change something.
> 2. Upload.
> 3. Test.
> 4. Repeat.
>
> So my next question is: If I "bzr shelve" and "bzr upload", will my
> shelved changes also be uploaded? It just occurred to me that I could
> use Bazaar like this:

When changes are shelved, they're only visible to the shelve plugin,
so an upload would upload the working tree without the shelved
changes.

> 1. Change something.
> 2. Shelve it.
> 3. Upload it.
> 4. Test.
> 5. Repeat.

I'm not sure why you would do this, as this would be the same as
uploading the tree before the changes.

> When I finish the feature I unshelve everything and commit.
>
> Would this work?
>
> Thanks.
> --
> No trees were killed in the generation of this message. A large number
> of electrons were, however, severely inconvenienced.
>



More information about the bazaar mailing list