lp:~liangg-guo/mysql-server/5.5
- Get this branch:
- bzr branch lp:~liangg-guo/mysql-server/5.5
Branch merges
Branch information
Recent revisions
- 4035. By Davi Arnaut <email address hidden>
-
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>
-
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
move.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:
- lp:mysql-server/5.6