ourdelta-developers team mailing list archive

[Arjen Lentz <arjen@xxxxxxxxxxxxx>]

Hi all,

I've upgraded the format of the ourdelta trunk on lp to 2a.
The old trunk is now trunk015fmt, so existing branches based on it (as  
well as all bugs, etc) still work; don't ever delete.

For the 5.1.39 build prep, there's an ourdelta-5.1.39 branch that has  
already merged in the fixed from knielsen, cafuego and evil_steve

For your local bzr, I recommend using the bazaar PPAs on Launchpad  
(Debian/Ubuntu), this also keeps you neatly up-to-date.
On other platforms (RHEL/CentOS, OSX, Win, etc), just grab a bzr 2.x  
source and install following the instructions (it's Python).


To update your own local branches, see the following info
(from http://doc.bazaar-vcs.org/latest/en/upgrade-guide/index.html#migrating-branches-on-launchpad)

Migrating local branches after a central trunk has migrated
=============================================

To migrate a standalone branch:

   1. Grab the latest branch from the central location into a new  
directory.
   2. Pull or merge any changes you’ve made in your existing branch  
into the new branch.

To migrate branches in a shared repository:

   1. Create a fresh shared repository in the new format (2a or later).
   2. Grab the latest branch from the central location into a new  
directory inside the shared repository.
   3. Decide which of your local branches you want to migrate. (If  
you haven’t already, now’s a good time for Finding obsolete branches  
and purging them, after backing up first of course.)
   4. To migrate each local branch of interest, there are 2 options:

        * init an empty branch in the new repository and pull the  
revisions from the branch in the old repository across.
        * In the new repository, branch from trunk to the new branch  
name then merge your changes from the matching branch in the old  
repository.

The first method will give you a branch which is identical (in terms  
of revision history) to the old branch, but it’s parent branch will be  
set to the old branch, not your new trunk. If you use this method,  
you’ll probably want to edit your branch.conf file to update the  
parent branch setting.

In contrast, the second approach sets up the parent branch correctly.  
However, it isn’t ideal if you’re not ready to include all the latest  
revisions from trunk into that branch yet.

=============



Cheers,
Arjen,
--
Arjen Lentz, Exec.Director @ Open Query (http://openquery.com)
Exceptional Services for MySQL at a fixed budget.

Follow our blog at http://openquery.com/blog/
OurDelta: packages for MySQL and MariaDB @ http://ourdelta.org