[apparmor] test git repo

Steve Beattie steve at nxnw.org
Mon Oct 9 21:13:05 UTC 2017


On Tue, Sep 26, 2017 at 01:26:57PM -0700, Steve Beattie wrote:
> Please let me know if you see any issues with the repo. Thanks!

Based on an IRC conversation with Christian, I experimented with merging
the launchpad translations branch into the git tree via git-remote-bzr.
Unfortunately, git doesn't handle it that great, marking all the
differences as merge conflicts rather than being able to apply them
cleanly.

This is a concern both for the translations importer and for
outstanding bzr-based merge proposals. For the latter, these are mostly
smaller differences and should be relatively easy to resolve. For the
translations, since I'm the one who deals with those, I'll just cope.

However, I am going merge the existing outstanding translations
changes before we make the git tree official.

Thanks.

-- 
Steve Beattie
<sbeattie at ubuntu.com>
http://NxNW.org/~steve/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 801 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/apparmor/attachments/20171009/130fa7e5/attachment.sig>


More information about the AppArmor mailing list