Help/confirmation to establish a repository

[Massimo Manca]

Dear all,
I need some help/confirmation to establish a common repository. My
necessity is to have a common repository always accessible on a hosted
website on which I can't have full control of the server. My idea is
that I will replace cvs with bazaar to have these improvements:
1. solves some cvs troubles that gave me a lot of headaches as renaming
files, correct unwwanted coperations like commits
2. it is distributed so we can work also offline
3. I can delete my internal cvs server and repository putting a
replicated repository on our hosted webserver (with free unlimited
diskspace) more accessible to us, to our customers and our consultants
24h every day
4. seems to be simpler then cvs

My development scheme will be this:
a) an engineer that will work on a project will establish a local
repository (it may contain more branches) coping files from the branch
in the common repository (points 0...8 of the description of my tests)
at the beginning there is just 1 branch
b) he will work on the files for some time (not more then 1 day or 1
week, it depends) making every bazaar operation may be useful to him
(also local commits)
c) he will check if the common repository branch is changed until 1st
import, eventually he updates the local branch
d) he eventually solves conflicts born after the update
e) he will commit modifications from local branch to the common one

I dream to have a PQM working in my situation but I haven't full control
on my hosted webpages/repository so I think it will not be possible but
also the described situation will be ok for me. I decide to experiment a
little bit with bazaar so actually I  established a local repository.
Also I am testing a web test repo, I will establish the good ones at the
end of these tests.
I need also tags so to create the repo and 1st project I did:

0. I am located on C:/BazaarTest (on a Windows 2000 PC)
1. bzr init-repo --no-trees --dirstate-tags repo
2. bzr init repo/Komina --dirstate-tags (this is the 1st project to put
on bzr control)
3. bzr checkout --lightweight repo/Komina KominaBase (this is the main
trunk for Komina project)
4. copy c:\Projects\Komina\*.* c:\BazaarTest\KominaBase
5. cd KominaBase
6. bzr add
7. bzr commit -m "initial source code import"
8. bzr tag --revision=1 "Rel. 1.5" (just an example of an imported
release always managed in cvs)

If I understand well I have to create a repo for every project I need to
put under bazaar control, so I will repeat points 1 to 8 for every project.
So , KominaBase it is my working directory containing the source code of
the base trunk. If I will create a new branch staing in KominaBase I
have to:
0. I am located on C:/BazaarTest/KominaBase
1. bzr branch ../KominaBase ../KominaRevA
now KominaRevA contains the copy of all files contained in KominaBase
then I make some modifications on files inside KominaRevA just to test
purposes.
2. I run bzr status to see modified files
>>>>>>>>>>> I don't understand why branch nick: komina (I would expect
KominaRevA)
3. I make some modifications on KominaBase files
4. I commit KominaBase modifications
Before to commit KominaRevA modifications I try to see if there are
modifications on kominaBase that is the root trunk for KominaRevB with:
bzr missing ../KominaBase (I would like a way to don't specify the
branch parent) so I discovered that KominaBase was updated after I
started KominaRevB branch, I have to import its changes in KominaRevA:

what is the correct command?????????

5. bzr update only works inside the same branch is it correct?

Then I have to check if there are conflicts:
6. bzr conflicts --text (with or without --text)
finally I can commit my changes:
7. bzr commit -m "bug #553 corrected"
and for documentation purpose I can perform a diff and save its result
inside the bug management program:

what is the correct or the best syntax for bzr diff? I would like to
have a simple syntax to make the diff between KominaRevA and the
original KominaBase (that used to make the branch) and I suppose it is
simply bzr diff
and a simple syntax to make the diff between KominaRevA and the updated
(may be that a different engineer udated it after I made KominaRevA
branch) in the base branch.
8. bzr diff ??????????????????

Actually when we work with more working directories derived from
different branches of the same project we make a directory structure like:

Komina (the project name)
Komina/KominaBase
Komina/KominaRevA
Komina/KominaRevPink
and so on

can be a problem to work with bazaar this directory scheme?

Best regards,
-------------- next part --------------
A non-text attachment was scrubbed...
Name: massimo.manca.vcf
Type: text/x-vcard
Size: 340 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20070417/4402313f/attachment.vcf