Mir

Code review comment for lp://qastaging/~mir-team/mir/trunk-0.1.5

Revision history for this message
Daniel van Vugt (vanvugt) wrote :

I figured out what this branch is composed of and it's not r1372...

1. Start with dev r1377, but there's still about 1000 lines different.
2. Manually patch in https://code.launchpad.net/~alan-griffiths/mir/fix-1276704/+merge/205357
3. Add an unexplained change to debian/rules
4. debian/changelog additions.

I think we need to do this more cleanly so we know what's actually going in to the merge. Otherwise there's no accurate historical log of what has changed and why.

I suggest starting dropping #2 and proposing it separately, directly to lp:mir with the trunk-0.15 branch as prereq. Unless it lands in development-branch beforehand, which would be cleaner. I also would like to know where #3 (debian/rules change) has come from, and some documentation of that change.

It would reflect badly on mir-team if we review changes to development-branch carefully, but don't do the same for lp:mir and let in undocumented changes.

review: Needs Fixing

« Back to merge proposal