[ANN][RFC] plugin package: ezbzr
John Arbash Meinel
john at arbash-meinel.com
Fri Jan 20 15:05:08 GMT 2006
Nathaniel McCallum wrote:
> On Fri, 2006-01-20 at 15:17 +0100, Jan Hudec wrote:
>
>>Ok. If you merge but want to continue to build on last revision on
>>your
>>branch, then yes. But I would usually want to continue from the merge
>>result
>>- the mainline only has (unless someone makes a mistake of course)
>>working
>>stuff and the earlier I incorporate it to my work, the easier the
>>final merge
>>is going to be.
>
>
> The problem in our scenario is that we have 3 mainlines and I can't have
> what's in mainline A pollute mainline B or C. So if I merge mainline A
> into my tree and then 'release' to mainline B, I've just polluted the
> second mainline.
>
> Nathaniel
We discussed this on IRC, and I think the best course of action is just
to have a local copy of A, B, and C, and then you can merge and push
whatever you want.
If space is an issue, there are things you can do. (I mirror pretty much
all branches I come across, which is about 1-2GB right now). I wrote a
script which goes through and finds weave files with matching md5 sums,
and then hardlinks them. It saves me about 1/2 GB on my bzr mirrors.
Which is not trivial. I can post it if people are interested.
It is relatively safe, since bzr atomically replaces weaves if they are
modified.
An even better version would actually merge similar weaves together, and
give you effectively a 'repository' today. But I didn't feel it was all
that important for me.
John
=:->
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 256 bytes
Desc: OpenPGP digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060120/07c0262d/attachment.pgp
More information about the bazaar
mailing list