<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> <html> <head> <meta content="text/html;charset=ISO-8859-15" http-equiv="Content-Type"> <title></title> </head> <body bgcolor="#ffffff" text="#000000"> Massimo Manca wrote: <blockquote cite="mid:46247DF1.304@micronengineering.it" type="cite"> <pre wrap="">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 </pre> <blockquote type="cite"> <blockquote type="cite"> <blockquote type="cite"> <blockquote type="cite"> <blockquote type="cite"> <blockquote type="cite"> <blockquote type="cite"> <blockquote type="cite"> <blockquote type="cite"> <blockquote type="cite"> <blockquote type="cite"> <pre wrap="">I don't understand why branch nick: komina (I would expect </pre> </blockquote> </blockquote> </blockquote> </blockquote> </blockquote> </blockquote> </blockquote> </blockquote> </blockquote> </blockquote> </blockquote> <pre wrap="">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????????? </pre> </blockquote> bzr help missing (as a command; actually there is a lot of bzr help available :)) <blockquote cite="mid:46247DF1.304@micronengineering.it" type="cite"> <pre wrap=""> 5. bzr update only works inside the same branch is it correct? </pre> </blockquote> that's correct; to get changes from another branch you would have to use "bzr merge" followed by conflict resolution and commit (or "bzr pull" if the branches haven't diverged) <blockquote cite="mid:46247DF1.304@micronengineering.it" type="cite"> <pre wrap=""> 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 ?????????????????? </pre> </blockquote> bzr diff branch1 branch2 should show you changes between two working trees; also see bzr help diff (the bzr commands are usually well documented, so bzr help is your friend) <blockquote cite="mid:46247DF1.304@micronengineering.it" type="cite"> <pre wrap="">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? </pre> </blockquote> I don't see why it shouldn't work; if you manage to get python support on the host you may actually be able to also run a pqm (well, it _is_ possible to write one in PHP, but you would have to be able to execute external commands from PHP, and hosts don't usually allow that). </body> </html>