Log from 2019-01-04:
[00:36:50] *** Joins: physkets (~physkets@unaffiliated/physkets)
[08:26:06] *** Joins: wrtlprnft (~firstname.lastname@example.org)
[09:02:22] *** Quits: physkets (~physkets@unaffiliated/physkets) (Quit: physkets)
[10:50:02] *** Joins: physkets (~physkets@unaffiliated/physkets)
[12:32:39] <ljrbot> New news from bzr: [0.4-armagetronad-fortress_ai-unified-raw] r2692 Merge from lp:~armagetronad-dev/armagetronad/trunk-armagetro... || [armagetronad-unification-scripts] r37 Disabling cmake branch, does not work :(... || [armagetronad-unification-scripts] r36 Renamed target branch, we need to postprocess it....
[14:24:24] *** Quits: physkets (~physkets@unaffiliated/physkets) (Quit: physkets)
[15:12:26] <Z-Man> ct|kyle: I had to delete the last two branches again (the ct ones), they turned out to be divergent when imported into git. I need to take more care creating them.
[15:33:26] <ljrbot> New news from bzr: [armagetronad-gitbzr-scripts] r24 git co -> git checkout, not everyone has that alias.... || [armagetronad-gitbzr-scripts] r23 removed --dry-run training wheels
[16:03:33] <ljrbot> New news from bzr: [armagetronad-gitbzr-scripts] r22 added local test case
[16:51:52] <ct|kyle> Z-Man: thanks for letting me know, I might get some time to see if ican merge them this weekend
[18:05:26] <Z-Man> GAAAA, that explains a lot. 'bzr revno -r ancestor:<other branch>' doesn't work properly.
[18:20:35] <Z-Man> Correction: It does work properly. But there's inteed a common revision on trunk-fortress_ai and 0.4-armagetronad that's not yet on the revision I'd like revno-r ancestor to report.
[18:21:14] <Z-Man> Lesson: Do not daggy-merge individual bugfixes into feature branches.
[18:21:54] <Z-Man> Meta-Lesson: Do not apply things you just heard about willy-nilly just because they sound cool and clever.
[18:22:18] <Z-Man> Nah, not learning that one.
[18:27:28] <Z-Man> That explains why it was next to impossible to merge the fortress_ai branch.
[18:27:49] <Z-Man> And also why all the clever transfer stuff I tried yesterday did not work at all.
[19:33:18] <ct|kyle> interesting
[19:34:37] <ljrbot> New news from bzr: [armagetronad-unification-scripts] r39 With the new cleanup, the old branch name is fine.... || [armagetronad-unification-scripts] r38 Cleaner repair process....
[21:22:54] *** Joins: Z-Man- (~Z-Man@p5b326461.dip0.t-ipconnect.de)
[21:22:54] *** Z-Man is now known as Guest81053
[21:22:54] *** Z-Man- is now known as Z-Man
[21:26:33] *** Quits: Guest81053 (~Z-Man@p5B32624E.dip0.t-ipconnect.de) (Ping timeout: 258 seconds)
View entire month
DISCLAIMER: These logs of public chat may contain some content which may not be appropriate for all audiences. Use at your own risk.
Logs from 2006-2009 pulled from wrtlprnft
Format changes at: 2015-08-25, 2017-02-20, and 2020-03-23. Times (2015 and later) should be Eastern.