graphite-dev team mailing list archive

[Sidnei da Silva <sidnei.da.silva@xxxxxxxxxxxxx>]

Hi Chris,

On Thu, Aug 25, 2011 at 3:29 AM, Chris Davis <chrismd@xxxxxxxxx> wrote:
> In other news, our bzr repository is in dire need of an upgrade to the 2a
> format so we can properly merge in people's branches which are all on the
> newer format. The caveat here is that when we upgrade the repository, you
> will have to upgrade your branches as well in order to be able to push to
> trunk. I propose we just set a date and go for it, so how about September
> 1st? Please let me know if you have any objections otherwise I will proceed
> with the upgrade.

(cc'ing Marting Pool for advice)

Should we go for splitting carbon and whisper into separate branches
as well? Apparently the way to do this is to us 'bzr split
<directory>' which keeps all history, so merges would still be doable.

Roughly what it does is to create split branches which remove all the
files but the split directory and makes the split directory the root,
so if you merge an existing branch into the split branch it will only
keep the part of the merge that applies to the non-removed files.

Also note there's a 'Upgrade branch' button in Launchpad which will do
the upgrade for you. The caveat is that there's a specific order in
which branches hosted in Launchpad need to be upgraded, which escapes
me now. I believe it needs all branches but trunk and the 1.1 branch
to be upgraded (since they are 'stacked on' trunk and 1.1), and only
then you upgrade 1.1 and trunk.

-- 
Sidnei

Make the most of Ubuntu with Landscape
http://landscape.canonical.com