<- Previous Log | Select Different Log | Next Log -> |
Searching from 2020-07-02 00:00:00 to 2020-07-02 23:59:59.999999. Query completed in 10.94 seconds [2020-07-02 08:06:57] <Armanelgtron> well, evidently attempting to just push the Git +ap onto the Baazar branch on Launchpad causes the message "These branches have diverged. Use the missing command to see how. Use the merge command to reconcile them." [2020-07-02 08:07:08] <Armanelgtron> guess I won't be doing that ... [2020-07-02 08:09:18] <Armanelgtron> I guess if I want this to actually work I'll have to look into properly syncing everything [2020-07-02 08:12:44] <Armanelgtron> the missing command says I have 1115 extra revisions and am missing 1117 revisions (which .. well, I did try to commit 2 revisions, so there's one thing) [2020-07-02 08:14:54] <Armanelgtron> and I dont think merge would have actually accomplished what I wanted to? [2020-07-02 08:26:14] <Armanelgtron> hmm, I'd probably also have to include some of armagetron's other branches if I would expect merging to actually work ... [2020-07-02 08:27:12] <Armanelgtron> and it wasn't really my goal to rehost the entirety of armagetron on yet another repository that even less people will look at... [2020-07-02 08:29:13] <Armanelgtron> (well, I have no real goals in mind with any of this stuff) [2020-07-02 08:34:26] <Armanelgtron> ideas? sure, but I just wait around a few years before actually working on them :D [2020-07-02 08:48:23] <Armanelgtron> oh yikes, I've spammed my inbox [2020-07-02 08:49:08] <Armanelgtron> and probably a few other people's .. [2020-07-02 12:08:02] <Z-Man> YES [2020-07-02 12:08:24] <Z-Man> No worries, I have a lp filter. [2020-07-02 18:42:18] <ljrbot> New news from bzr: [0.2.9-armagetronad-sty+ct+ap] r1116 More aspect ratio correction: for text in server browser and... [2020-07-02 20:40:52] <-- MrBougo has quit (Ping timeout: 272 seconds) [2020-07-02 20:43:43] --> MrBougo has joined the channel [2020-07-02 21:31:52] <-- Z-Man has quit (Ping timeout: 260 seconds) [2020-07-02 21:36:43] --> Z-Man has joined the channel [2020-07-02 21:49:07] <Armanelgtron> oi I've just noticed the cursor blink rate seems to depend on frames instead of time [2020-07-02 22:43:09] <ljrbot> New news from bzr: [0.2.9-armagetronad-sty+ct+ap] r1117 "Hack" to fade zones in before round beginsView entire month