bazaar branch fails

John Arbash Meinel john at arbash-meinel.com
Mon Apr 28 23:54:53 BST 2008


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Rahul Nabar wrote:
| While using bazaar to version scripts on my Linux box frequently I
| come across a script that I want to enhance. Say script.sh
|
| I'd prefer working on a development version till I'm sure it works and
| then I can safely unleash it on my users. I thought this was a good
| (albeit trivial perhaps) spot to use bzr branch.
|
| I tried:
|
| bzr add script.sh
| bzr commit script.sh
| bzr branch script.sh script.sh.devel
|
| bzr: ERROR: Not a branch: "home/user/xxx/yyy/code/"
|
| Is this a wrong spot to use branch? Or am I not using the correct syntax?
|
| Any suggestions?
|

In Bazaar, you branch at the "whole project" level, not at the per-file level.
So you would generally have a:

project-mainline/

and a

project-devel/

branch.

Then when you are working on things you go:

cd project-devel/
1) edit "script.sh"
2) bzr commit -m "did X to script.sh"
3) loop until done
4) cd project-mainline
5) bzr merge ../project-devel
6) review changes, cleanup anything, resolve conflicts, etc.
7) bzr commit -m "merged devel changes into trunk"

This will end up merging all of your "devel" changes into trunk. So if you are
thinking about several different things, we suggest making a separate "feature"
branch for them. Often changes will cover more than one file anyway.
John
=:->
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iEYEARECAAYFAkgWVb0ACgkQJdeBCYSNAAOUXgCeIGo37QVEInKBs4gYS3+FytAB
zvAAoIHWNMVtRBgYppX7GsLnCBKW9gcZ
=8JyV
-----END PGP SIGNATURE-----



More information about the bazaar mailing list