Created by Liang Guo and last modified
Get this branch:
bzr branch lp:~liangg-guo/mysql-server/5.5
Only Liang Guo can upload to this branch. If you are Liang Guo please log in for upload directions.

Branch merges

Related bugs

Related blueprints

Branch information

Liang Guo
MySQL Server

Recent revisions

4043. By Liang Guo on 2014-03-07

Merge MySQL 5.5.36

4042. By Liang Guo on 2014-01-16

Merge MySQL 5.5.35

4041. By Liang Guo on 2013-10-22

Merge mysql-5.5.34 local

4040. By Liang Guo on 2013-08-05

Merge MySQL 5.5.33

4039. By Liang Guo on 2013-07-25

Merge MySQL 5.5.32

4038. By Liang Guo on 2013-04-30

Merge MySQL 5.5.31

4037. By Davi Arnaut <email address hidden> on 2013-02-06

Merge MySQL 5.5.30.

4036. By Davi Arnaut <email address hidden> on 2013-01-05

Merge MySQL 5.5.29.

4035. By Davi Arnaut <email address hidden> on 2013-01-05

Add "packaging/rpm-uln/" directory.

Directory "SPECIFIC-ULN/" was removed in the parent revision. Now the
directory is added in a new path but with the same file ids.

4034. By Davi Arnaut <email address hidden> on 2013-01-05

Relocate directory "SPECIFIC-ULN/ to "packaging/rpm-uln/".

Revision <email address hidden>, which
renames the directory "SPECIFIC-ULN/" to "packaging/rpm-uln/" broke the
importation of changes from the upstream MySQL bazaar tree to git.

The cause of the problem is that the bzr-git plugin, which is used to
import said changes, does not properly handle directories being renamed
(see Launchpad Bug#818318). In this case, the import succeeds but ends
up creating a broken tree.

In order to work around this problem, the "SPECIFIC-ULN/" directory is
removed and re-added (with same file ids) as "packaging/rpm-uln/" in a
later revision. This basically mimics the rename as a remove and add.
This way, the bzr-git plugin is able to correctly handle the directory

From this point on, upstream changes will need to be merged, but this
shouldn't cause any conflicts.

Branch metadata

Branch format:
Branch format 7
Repository format:
Bazaar repository format 2a (needs bzr 1.16 or later)
Stacked on:
This branch contains Public information 
Everyone can see this information.