Add global option --root=dir to specify location of .bzr
aaron.bentley at utoronto.ca
Mon Mar 12 17:54:05 GMT 2007
-----BEGIN PGP SIGNED MESSAGE-----
Jari Aalto wrote:
> John Arbash Meinel <john at arbash-meinel.com> writes:
>> There will probably be a couple conflicts where files modified in the
>> dev branch show up as deleted in the published branch. But they
>> shouldn't be very hard to resolve. In my testing it versions a foo.OTHER
>> file, and marks a conflict for 'foo'.
> Yes that would work. It however requires to set up similar structure
> for every current an ongoing project and doing rm+merge command +
> conflict resolution.
As long as you're merging subsets into supersets, you shouldn't have to
deal with any merge bogosities, except for the first merge.
If you can set up your directories so that each owner controls a
different subdirectory, then you can use nested-by-reference trees for
/project/ <- containing tree
/project/developer <- subtree
/project/publish <- subtree
With this set-up, commits in /project will also affect /project/publish
and /project/developer, but you can "publish" /project/publish separately.
> What do you think about generalizing the bzr enought to accomodate any
> ROOT and any user setting?
I'm not in favour of it.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org
-----END PGP SIGNATURE-----
More information about the bazaar