Need help with workflow

John Arbash Meinel john at arbash-meinel.com
Fri Jan 15 20:45:21 GMT 2010


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

Gordon Tyler wrote:
> So I persuaded my wife to use Bazaar (she's used svn in the past) for a
> small project that she's working on and everything is going fine so far.
> The setup is currently as follows:
> 
> On a shared server on our home network, there is a tree-less repo
> containing a trunk branch accessed via
> bzr+ssh://server/repos/project/trunk. On her PC, she has branched trunk
> into a directory, in which she makes changes, commits and then pushes up
> to the server when she wants to share the changes with me.
> 
> Now that she wants to create another branch for making some changes in
> parallel without disturbing the stability of the trunk -- a feature
> branch. However, this is complicated by the requirement that her working
> directory has to be in a specific location. We can't just create a repo
> and have subdirectories for the branches.
> 
> Would Neil's bzr-colo plugin be a good fit for this situation? What else
> would you suggest?
> 
> Thanks,
> Gordon

bzr push --remember bzr+ssh://.../project/new-branch

And just keep working as normal. All new commits will be pushed to the
new branch rather than the trunk. When she is ready to land the changes
on trunk:

bzr push # Make sure all changes are published
bzr pull --overwrite bzr+ssh://.../project/trunk # Switch back to trunk
bzr merge bzr+ssh://.../project/new-branch
bzr commit -m "Merge the new-branch into trunk"

It is easier to do this sort of thing with a lightweight checkout
pointing at branches, etc. But you can certainly do it with the current
setup.

John
=:->

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAktQ0+EACgkQJdeBCYSNAANuxgCgndWXYQsCC9Z4R4GOx4kBLJqk
KCYAniAmnhCpnHoG8O2CiHpS7rRlJZZO
=mfmp
-----END PGP SIGNATURE-----



More information about the bazaar mailing list