[pkg-apparmor] Ubuntu/Debian apparmor package maintenance in bzr

[intrigeri]

Hi,

coming back to it for merging 2.10:

Steve Beattie wrote (06 May 2015 00:08:34 GMT) :
> Unfortunately, Jamie and I don't use the package importer branch [0]
> [...]

Full ACK on not having quilt patches applied in the VCS. Whenever I've
merged the auto-generated bzr branch generated from package uploads,
first thing I did was to `quilt pop -a' and commit the result.

> Instead, we've been working off of the
> lp:~apparmor-dev/apparmor/apparmor-ubuntu-citrain branch [1]; [...]

Thanks! This clarifies things, indeed :)

I wanted to reconcile our histories, so I've tried to merge this
branch into the Debian packaging one, and I got a huge merge conflict
that renamed all my previous top-level directories to ".moved" and put
yours in their place.

I see lots of such conflicts:

  Conflict adding files to utils/vim.  Created directory.
  Conflict because utils/vim is not versioned, but has versioned children.  Versioned directory.

So I `bzr revert'ed, and tried merging your revision for
2.9.2-0ubuntu1 with `bzr merge -r 1567 ../ubuntu/citrain/', hoping
that merging a revision that has the same upstream files would help.
No luck, same problem. I'm no expert at bzr, and lack the
time+motivation to become one (especially with Git support landing
into Launchpad, hint, hint ;)

So... I did the merge in Git (thanks to git-remote-bzr), rsync'ed the
resulting conflict resolution to my bzr tree, told bzr that I had
resolved every conflict.

As a result, our Vcs-Bzr history in Debian now contains Ubuntu's,
woohoo :)

I've just pushed, quickly tested, but will only upload (to
experimental, due to the ongoing GCC 5 transition) tomorrow, after
having another look at the big picture.

Time to look at the remaining changes we've introduced, and make the
delta smaller?

Cheers,
-- 
intrigeri