<- Previous Log Select Different Log Next Log ->  
Log from 2019-01-02:
[08:50:42] *** Quits: physkets (~physkets@unaffiliated/physkets) (Quit: physkets)
[10:41:42] *** Joins: physkets (~physkets@unaffiliated/physkets)
[12:35:33] <Z-Man> ct|kyle: Dunno, I only get merge conflict errors. You edit the marked files, remove the <<<<< ===== >>>>> markers (deciding each time which version of the code to keep, or maybe write new code, whatever is required), then call 'bzr resolve <filename>'
[12:36:45] <Z-Man> But I'm going to try something else, it should be possible to just move the branches over at the state of 0.4 they're at. The merge then can happen on the new branch or in the git import and isn't going to be harder.
[14:26:53] *** Quits: physkets (~physkets@unaffiliated/physkets) (Quit: physkets)
[16:42:04] <ct|kyle> what command are you running to do the merge
[16:42:23] <ct|kyle> I think I may not have the correct branch
[16:42:34] <Z-Man> that could be
[16:43:12] <Z-Man> I use 'bzr merge bzr+ssh://bazaar.launchpad.net/~armagetronad-dev/armagetronad/0.4-armagetronad-work/'
[16:43:22] <Z-Man> while in the hack branch.
[16:43:40] <Z-Man> Or the other way round, I make a local branch of bzr+ssh://bazaar.launchpad.net/~armagetronad-dev/armagetronad/0.4-armagetronad-work/
[16:43:49] <ct|kyle> that's it, I was using bzr merge lp:armagetronad/0.4
[16:44:17] <Z-Man> Ah, yeah.
[16:44:34] <Z-Man> My partial transfer plan is going poorly, but I haven't given up yet.
[16:45:19] <ct|kyle> I should be able to resolve the conflicts, when I have a little more time to do that
[16:46:08] <ct|kyle> hopefully they work, I am for some reason having trouble running the code
[16:50:04] <Z-Man> Maybe trouble with a new compiler version that was fixed on 0.4-work in the meantime?
[17:22:52] <ljrbot> New news from bzr: [0.4-armagetronad-ct-unified] r2489 Merge from lp:~armagetronad-ct/armagetronad/armagetronad-ct || [armagetronad-unification-scripts] r31 Support for merging from hack branches that are not up to da...
[17:23:05] <Z-Man> Partial transfer seems to have worked: lp:~z-man/armagetronad/0.4-armagetronad-ct-unified
[17:23:49] <Z-Man> That one should be merge compatible with lp:armagetronad.
[17:26:33] <Z-Man> 'bzr missing' tells me it's 642 revisions behind lp:armagetronad, 'bzr log -r ancestor lp:armagetronad' looks like the last common revision of the original branch and 0.4-armagetronad-work. Seems fine.
[17:28:50] <Z-Man> The other problem child is there, too: lp:~z-man/armagetronad/0.4-armagetronad-ct-ladderlog-unified
[17:53:00] <ljrbot> New news from bzr: [armagetronad-unification-scripts] r34 Forgot to save...... || [armagetronad-unification-scripts] r33 Enabling all hack branches.... || [armagetronad-unification-scripts] r32 Enabling push of result to lp.... || [0.4-armagetronad-ct-ladderlog-unified] r2426 Merge from lp:~armagetronad-ct/armagetronad/armagetronad-ct-...
[18:49:06] <ct|kyle> Z-Man: not sure, make run gave me a seg fault
[18:49:23] <ct|kyle> I've not had that much time to look into it though
[18:49:52] <ct|kyle> I'm trying to revive ct's old forums :)
[21:28:45] *** Joins: Z-Man- (~Z-Man@p5B3262CF.dip0.t-ipconnect.de)
[21:28:45] *** Quits: Z-Man (~Z-Man@p5B32624F.dip0.t-ipconnect.de) (Killed (orwell.freenode.net (Nickname regained by services)))
[21:28:45] *** Z-Man- is now known as Z-Man

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]