<- Previous Log Select Different Log Next Log ->  
Log from 2018-12-29:
[00:18:22] *** Joins: physkets (~physkets@unaffiliated/physkets)
[04:21:45] <luke-jr> did the bzr-svn mess ever get fixed? or is the old history lost forever at this point?
[04:40:58] <Z-Man> Depends on what you mean :) The bzr-svn mess broke some revisions in bzr, for example the utf8 branch merge. Those had to be squashed together with the adjacent good revisions. All the non-borked history of 0.2.8 and 0.4/trunk is preserved.
[04:51:12] <luke-jr> I mean going back to the original armagetron CVS :p
[04:51:36] <luke-jr> bzr-svn originally imported the branches only going back to the start of armagetronad
[04:51:54] <luke-jr> I *think* at one point, bzr-svn fixed that bug, but only for new branching..
[12:25:24] <ct|kyle> we mise as well add github and do a github to git lab sync too :)
[13:27:36] <Z-Man> ct|kyle: that's the plan.
[13:30:17] <Z-Man> luke-jr: no, those old revisions are not in there. Nobody but you cares about them :) Priority was to have merge compatibility between 0.2.8, the hack branches and master (trunk/0.4), and since 0.2.8 and the hack branches don't have them, the master branch can't have them either, at least not logically before anything on 0.2.8.
[13:32:18] <Z-Man> It would now be possible to stitch the pre-armagetroad history onto the master branch just to have it there, but it would only be there as an appendix with no practical advantage. I think. I'm not entirely sure how 'git annotate' picks the revision it assigns to a current line in case of conflict,
[13:33:27] <Z-Man> but I guess if it acts in any way logical it would either always ignore the pre-history revisions or, worse, attribute more recent changes to a stitching commit used to bring the pre-history into the current branch.
[14:39:02] *** Quits: physkets (~physkets@unaffiliated/physkets) (Quit: physkets)
[15:12:57] <ct|kyle> Z-Man: should I update our trunk / 0.4 branches with trunk or 0.4 branch on launchpad?
[16:32:41] <Z-Man> ct|kyle: check the branch status. I think I set lp:armagetronad-trunk-* to 'abandoned', we were only actively working on 0.4 anyway.
[16:33:38] <Z-Man> Nobody was regularly merging/pushing from 0.4 to trunk, and I think the only change on trunk happened because I confused stuff once.
[16:33:59] <Z-Man> So 0.4 it is, without the -work suffix.
[16:38:01] <Z-Man> Oh, if you do have branches based on 0.4-work, keep merging from 0.4-work. the no-work branches are merge incompatible. I can convert branches over for you if you like, or just provide a script (it's almost there already, it just needs some massaging to work on arbitrary branches)
[19:00:36] <ljrbot> New news from bzr: [0.2.8-build_eclipse-work] r18 Added editor backup files to gitignore
[19:30:43] <ljrbot> New news from bzr: [0.4-build_eclipse] r26 Merge from 0.2.8....
[19:33:30] <ct|kyle> I think all were just 0.4 they were either started with that or trunk before 0.4 branch
[19:34:12] <ct|kyle> there are only 3 or 4 more that I think might be nice to keep
[19:56:42] <Z-Man> Switching anything from trunk to 0.4-work should not be a problem.
[19:59:17] <ct|kyle> ok, I think that is what everything is based on then
[20:00:51] <ljrbot> New news from bzr: [0.4-armagetronad] r3085 Move filtering of -Werror and -Wpedantic...
[20:14:10] <ct|kyle> cd ../
[20:14:14] <ct|kyle> oops :)
[20:29:45] <ct|kyle> well 1 branch claims it cannot be merged into from lp:armagetronad
[21:01:04] <ljrbot> New news from bzr: [0.2.8-armagetronad-sty+ct+lua] r779 Merge with mainline
[21:02:28] <ct|kyle> looks like all my trunc / 0.4 realted branches won't merge, I'll try doing the merge with git instead
[21:03:07] <ct|kyle> just makes the history look dirty, and then there is a merge commit
[21:29:43] *** Joins: Z-Man- (~Z-Man@p4FE3E3FC.dip0.t-ipconnect.de)
[21:29:43] *** Quits: Z-Man (~Z-Man@p5B3268BE.dip0.t-ipconnect.de) (Killed (tepper.freenode.net (Nickname regained by services)))
[21:29:43] *** Z-Man- is now known as Z-Man
[23:55:00] *** Joins: physkets (~physkets@unaffiliated/physkets)

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.


 
 
 ArmaNelgTron.tk
 © NelgTron 2014-2021. Made for . [About this site] [Credits]