[01:58] <sergio-br2> hi
[01:58] <sergio-br2> dpkg-source: info: building mgba in mgba_0.4.0-r2309-4c38f76~ubuntu16.04.1.tar.xz
[01:58] <sergio-br2> I thought r{revno} in git should always increase
[01:59] <sergio-br2> last version was r3001
[02:12] <sergio-br2> it went from r3001 to r2309
[02:12] <sergio-br2> https://code.launchpad.net/~endrift/+recipe/mgba-daily
[02:15] <hloeung> maybe a bunch of commits was squashed to tidy up the history logs
[02:15] <hloeung> should probably switch from using revno to a date
[02:16] <hloeung> sergio-br2: ^
[02:16] <sergio-br2> it's more reliable yeah
[02:23] <wgrant> sergio-br2, hloeung: It's also relatively common in git to change the LHS history, which is never done in bzr.
[02:24] <wgrant> eg. rather than merging a branch into trunk, you merge trunk into the branch and then push the branch over trunk.
[02:24] <wgrant> No revisions are removed from history, but the LHS changes, so the revno changes.
[02:25] <wgrant>     Merge branch 'master' into feature/thread-proxy-renderer
[02:25] <wgrant> That's what happened here.
[02:25] <wgrant> A branch from October was merged by pushing it over master.
[02:27] <sergio-br2> oh
[02:27] <sergio-br2> ok thanks
[02:27] <sergio-br2> I'll change to date I guess then
[02:44] <sergio-br2> see ya
[09:13] <cjwatson> wgrant: "never" - I must be imagining all the times people did exactly that with ubuntu-seeds :-)
[09:14] <wgrant> cjwatson: Well I just pretend that append_revisions_only is the default because it's the only sane thing.
[09:14] <cjwatson> I thought that only required that the thing you push be a descendant.
[09:15] <cjwatson> Not that it have the same graph balance.
[09:23] <wgrant> cjwatson: No, the descendant requirement is always in place unless you use --overwrite.
[09:26] <cjwatson> Ah, yes, ARO does iter_lefthand_ancestry.  Fair enough.
[09:26] <cjwatson> wgrant: Did you get a chance to check over my proposed procedure to merge those accounts?
[09:28] <wgrant> cjwatson: I think so, but I forget exactly which state transitions are permitted by the form.
[09:28] <wgrant> But if they succeed it should work.
[09:29] <cjwatson> All right, it was the direction of merge I mainly wanted to double-check.  Thanks.
[09:29] <wgrant> cjwatson: Yeah, generally best to merge toward the account with the most references.
[10:21] <cjwatson> apollo13: Please try logging into your Launchpad account again now.  You should end up logged in as ~apollo13-deactivatedaccount; once you're logged in, you can visit https://launchpad.net/~/+edit and change your username to ~apollo13.
[10:21] <cjwatson> Er, to "apollo13" I mean.
[10:24] <apollo13> cjwatson: sec
[10:24] <apollo13>  (Error ID: OOPS-5d99cf26161476bbb18165f7d0db5cb8)
[10:25] <cjwatson> what
[10:27] <apollo13> that is the new oops
[10:27] <cjwatson> yeah, I know, my "what" was directed at trying to understand what's going on
[10:28] <cjwatson> the emailaddress row has status NEW, I think, so this is an account with no preferredemail
[10:29] <cjwatson> apollo13: right, colleague has fixed my confusion, try again?
[10:33] <apollo13> cjwatson: jay, login works
[10:34] <cjwatson> \o/
[10:34] <cjwatson> Sorry it took so long!
[10:36] <apollo13> no worries
[13:18] <chrisccoulson> Any idea what's happening with OOPS-777660d8bb39cb77df0367ce7054b467 (timing out whilst trying to change the status of a bug)?
[13:22] <cjwatson> chrisccoulson: some kind of internal postgresql maintenance task that blocks a trigger from creating temporary tables - should go away within about ten minutes
[13:22] <chrisccoulson> cjwatson, thanks