Re: [Gnu-arch-users] strategy to handle back-fixies

[Andrei A. Voropaev]

On Thu, Jan 20, 2005 at 09:06:45PM +0100, Jan Hudec wrote:
> On Thu, Jan 20, 2005 at 10:07:35 +0100, Andrei A. Voropaev wrote:
> > Hello!
> > 
> > I need an advice about the best strategy for the following situation.
> > 
> > I have an archive for the project. Another archive contains simbolic
> > tags (snapshots) from the first one. I have created snapshot X and have
> > been working on new features for snapshot Y. During the work I've fixed
> > couple of important though small bugs. Now my boss wants me to create
> > snapshot Z that is identical to X but includes those important bug
> > fixes.
> > 
> > One obvious (for me :) way could be to create one more archive, tag into
>                                                          ^^^^^^^
> You definitely don't need an                             ARCHIVE
> > it snapshot X, do the bug fixes and then tag from it into the snapshots
> > archive. But I'm not sure if this is going to work and if this is an
> > appropriate approach. Would it work when I add snapshot Y?
> 
> In fact, it's exactly what versions are for. The overall schema could
> look like:
> 
> archive/foo--dev--0
>     This is the "HEAD" where you work on the new features
> archive/foo--release--1--base-0
>     This is where you first released. Your snapshot X.
> archive/foo--release--1--patch-1
>     This is your snapshot Z. It does not matter whether you have
>     merged and commited it or tagged it (tags-only branch), but
>     I suggest mergeing, because tag-only branches behave a little
>     strangely, because they always only contain the last log.
> archive/foo--release--2--base-0
>     This will be where you will eventualy create snapshot Y.

That would be perfect. In fact I was (and still am) wondering how in
practice this shall work. So far no documentation mentions this
approach. So below are my guesses how it should work. Please correct me
if I'm wrong. Suppose I have project foo and it is in
archive/foo--mainline--1.0. So I 'get' this project

tla get foo--mainline--1.0 wdir

I do certain changes and create 3 patches by commiting those. So now I
have

foo--mainline--1.0--base-0
foo--mainline--1.0--patch-1
foo--mainline--1.0--patch-2
foo--mainline--1.0--patch-3

At this point I decide that this is going to be release 1.1. So in my
wdir I do

tla tag foo--mainline--1.0--patch-3 foo--mainline--1.1

Starting with that my archive shall have foo--mainline--1.0 and
foo--mainline--1.1 (at the point containing only base-0). Now I can
continue with applying fixes to foo--mainline--1.0 and develop
foo--mainline--1.1

Is this correct? Do I really have to tag from my 'wdir' or I can tag
from anywhere? (I would guess so)

-- 
Minds, like parachutes, function best when open