freecode

环境winxp,python2.5。下载bzr-1.5正常安装。
1、配置本地环境配置

On Linux: ~/.bazaar/bazaar.conf
On Windows: C:\Documents and Settings\username\Application Data\bazaar\2.0\bazaar.conf

Environment Variables
BZRPATH Path where bzr is to look for shell plugin external commands.
BZR_EMAIL E-Mail address of the user. Overrides EMAIL.
EMAIL E-Mail address of the user.
BZR_EDITOR Editor for editing commit messages. Overrides EDITOR.
EDITOR Editor for editing commit messages.
BZR_PLUGIN_PATH Paths where bzr should look for plugins.
BZR_HOME Directory holding .bazaar config dir. Overrides HOME.
BZR_HOME (Win32) Directory holding bazaar config dir. Overrides APPDATA and HOME.
BZR_REMOTE_PATH Full name of remote 'bzr' command (for bzr+ssh:// URLs).
BZR_SSH SSH client: paramiko (default), openssh, ssh, plink.
BZR_LOG Location of .bzr.log (use '/dev/null' to suppress log).
BZR_LOG (Win32) Location of .bzr.log (use 'NUL' to suppress log).

只使用了email。

2、初始仓库

md mybzr
cd mybzr
bzr init

3、发布到服务器

bzr push --create-prefix sftp://your.name@example.com/~/public_html/myproject


4、从服务器上checkout

bzr branch sftp://your.name@example.com/~/public_html/myproject

push 到服务器

bzr push sftp://your.name@example.com/~/public_html/myproject


5、本地产生分支

mybzr\cd ..

bzr branch mybzr newbzr

产生一个名为newbzr的分支


6、回到主干，查询差异

在newbzr下修改或新增内容

cd mybzr

bzr diff -r branch:../newbzr

7、合并

cd mybzr

bzr merge ../newbzr/

8、gtk界面

http://bazaar-vcs.org/bzr-gtk

todo:

1、用户认证

2、服务器仓库管理