the best way to use bazaar

[John Arbash Meinel]

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

Viktor Nagy wrote:
> Hi,
> 
> I would like to use bazaar in the future for my research/publications.
> As these are often coauthored projects I am thinking of the setup
> described below. Could you please give you opinion. Especially on the
> merging, updating way.
> 
> In the case of two authors I am planning to use three branches. One
> --no-trees which is kind of a trunk/main, and one for every author. All
> of them would be stored on my server to have a backup besides the local
> commits.
> 
> Do you think this is a good setup?

This sounds like a very good setup. My only concern is the format of the
publication. Some formats are easier to merge than others.

> 
> Then the question is how to make the merging/updating from/to between
> the main and the authors' branches? Especially, when I have some files
> that I don't want to share with the other author (actually, I don't have
> any, but it might happen).

If you really have things that you don't want to share, I would
recommend creating a second branch for them. Something like
"repo/private". Or "repo/author/private".

> 
> Do you have any recommendations?
> 
> Thanks for your help,
> Viktor


My general recommendation for any project that wants to have a "trunk"
is to have the writers/developers keep 2 local copies. One which is a
direct checkout of 'trunk' that they then merge into and commit, or
merge from. And another which is their working version.

There are a lot of benefits, which I can get into. But in summary,
mainline changes stay consistent, and you also have a copy of the
'trunk' to consult directly when you need to.

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

iEYEARECAAYFAkjyFyMACgkQJdeBCYSNAAMfswCgiQ5aRcexM8AckLySMQo3RlmJ
B9oAn3vVttCJpRwUkqPmn5tUI0Sz3bAQ
=e9sO
-----END PGP SIGNATURE-----