Hi John,
On 25 Dec 2010, at 20:12, John Deal <bassd...@yahoo.com> wrote:
> {...} BTW I finally got my desktop environment to work by forcing Boost to
> use Filesystem Version 2 files. I did not have to do this on my notebook.
> Very strange.
I'm glad you got it to work!
> Now I want to create a development branch for this problem and did this by
> issuing the command: bzr branch trunk workplaceDesc to create a workplaceDesc
> branch off my local trunk branch (which is an unchanged branch off the master
> trunk branch I assume).
>
> My question is where do I actually edit the files? The wiki talks about
> commits to the local branch but not checkouts. Reading the Bazaar
> documentation it seems checkouts are to create branches, not work files of a
> branch. If you edit a file in a branch does Bazaar determine via timestamps
> that the file has been changed?
Ok, so you have created a new branch from trunk and named it 'workplaceDesc'.
The idea is that you would then proceed to work on the Workplace Description
bug in your workplaceDesc branch directory.
Example:
(1) ~/$ bzr branch trunk workplaceDesc
(2) ~/$ cd workplaceDesc
(3) ~/workplaceDesc/$ bzr push --remember lp:~mira-dev/mira/workplace-desc
(4) ~/workplaceDesc/$ nano mira-client/README
(5) ~/workplaceDesc/$ bzr commit -m "Updated Client README for version 0.2"
(6) ~/workplaceDesc/$ bzr push
Explanation:
As I am sure you are aware, steps (1) and (2) create a copy of trunk named
'workplaceDesc' and change in to it.
Step (3) publishes the branch on Launchpad: under the 'mira-dev' group, for the
'mira' project, with the branch name 'workplace-desc'. Bear in mind that this
branch will consist of the same revisions as trunk, for now, because you have
not yet changed anything.
Step (4) is where you edit your branch. You should edit the files in your new
local branch, i.e. workplaceDesc.
In step (5), you commit your changes with a relevant comment.
And finally, in step (6), you publish those changes to your branch on Launchpad
(the location of which has been remembered by the '--remember' flag in step
(3)).
I don't know how Bazaar determines when a file has been changed, but you can
see whether it recognises that a file has been changed by running the command:
bzr st
Does that help? You might also find the Bazaar user guide and tutorials to be
of assistance. :)
Regards,
Max Bossino
Project Manager
http://miragroupware.org
------------------------------------------------------------------------------
Learn how Oracle Real Application Clusters (RAC) One Node allows customers
to consolidate database storage, standardize their database environment, and,
should the need arise, upgrade to a full multi-node Oracle RAC database
without downtime or disruption
http://p.sf.net/sfu/oracle-sfdevnl
_______________________________________________
Mira-development mailing list
Mira-development@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mira-development
