| 00:51.35 | starseeker | brlcad: could you open up the permissions on the timeline subdirectory for brlcad.org? |
| 00:51.39 | starseeker | can't modify it |
| 03:34.02 | maths22 | starseeker: you should be able to write to it now |
| 03:56.11 | brlcad | starseeker: you can/could -- everyone can sudo chown www files, and everyone can sudo -u www whatever on that file |
| 03:56.15 | brlcad | maths22: thx |
| 04:03.48 | maths22 | If I am working with webserver files, I like sudo -u www bash |
| 04:04.02 | maths22 | That way, all the permissions work out right |
| 04:16.07 | brlcad | maths22: shorthand, sudo -u www -s |
| 04:16.32 | brlcad | but it's better/safer to do it one command at a time, not through a whole subshell |
| 04:35.39 | starseeker | brlcad: ah, didn't realize that |
| 04:35.57 | brlcad | spelled out on the info page you read, just don't remember it ;) |
| 04:36.11 | starseeker | fair enough |
| 04:36.12 | brlcad | course, that was a long time ago for you |
| 04:36.28 | starseeker | 's gettin old |
| 04:37.08 | starseeker | well, too late tonight - I'll try and add a few new entries tomorrow |
| 05:02.16 | brlcad | sounds like you're making some progress on the stepcode merge, awesome |
| 05:03.33 | brlcad | don't know what you've tried, but my thought was to start with a fresh repo that has the original scl sources pristine |
| 05:03.52 | brlcad | then play forward the github branch commits |
| 05:04.31 | brlcad | on a branch |
| 05:04.36 | brlcad | then play forward our commits |
| 05:04.40 | brlcad | on another branch |
| 05:04.47 | brlcad | then merge the two branches |
| 05:05.13 | brlcad | at that point, it "should" have enough info to merge save for bonefide conflicts |
| 05:12.27 | starseeker | brlcad: I wasn't rewiring quite that far - I took the brlcad branch I imported from our svn tree, and did a merge with the master |
| 05:12.52 | starseeker | then I used meld and the mergetool option to step through what it claimed were the conflicts - quite a few actual issues |
| 05:13.38 | starseeker | I figured there'd probably be some manual clean-up after that, but it seemed (in principle) to get us where we needed to end up |
| 06:12.11 | brlcad | cool, progress either way |
| 06:21.13 | brlcad | interesting that there would be issues |
| 06:22.16 | brlcad | wonder if they were issues that become obsoleted by future commits (like a file that got deleted) or really something overlooked |
| 06:22.30 | brlcad | because in theory, our version integrated everything they did |
| 06:38.57 | brlcad | should be a good write-up whatever you figure out |
| 07:59.18 | *** join/#brlcad d_rossberg (~rossberg@66-118-151-70.static.sagonet.net) |
| 11:28.59 | Notify | 03BRL-CAD:bob1961 * 54466 brlcad/trunk/src/librt/primitives/ebm/ebm.c: Update the "get" and "adjust" commands for ebm to accept the use of "file" in place of the "F" attribute name. |
| 11:30.41 | starseeker | one of the points of divergence was Windows building - our solution was different than theirs, incorporating the re2c/lemon work |
| 11:31.01 | starseeker | their were some others, but that one was a stand-out |
| 11:33.10 | Notify | 03BRL-CAD:bob1961 * 54467 brlcad/trunk/src/librt/primitives/extrude/extrude.c: Update the "get" and "adjust" commands for extrude to accept the use of "sk_name" in place of the "S" attribute name. |
| 12:28.29 | Notify | 03BRL-CAD:bob1961 * 54468 brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl: Upgrade Archer's tree view to accommodate the hierarchy associated with the dsp, ebm, extrude, revolve and vol primitives. |
| 13:46.49 | Notify | 03BRL-CAD:bob1961 * 54469 brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl: Update ArcherCore::handleTreePopup to better accommodate dsp, ebm, extrude, revolve and vol. |
| 14:40.28 | *** join/#brlcad ``Erik (~erik@pool-74-103-121-45.bltmmd.fios.verizon.net) |
| 16:14.06 | *** join/#brlcad DarkCalf (~DarkCalf@173.231.40.98) |
| 17:12.52 | Notify | 03BRL-CAD:brlcad * 54470 brlcad/trunk/src/libbu/parallel.c: header cleanup, make sys/time.h inclusion not platform-centric but coupled to header test. our headers come after. |
| 17:13.02 | Notify | 03BRL-CAD:brlcad * 54471 brlcad/trunk/configure.ac: need to check for sys/resource.h |
| 18:33.40 | Notify | 03BRL-CAD:carlmoore * 54472 brlcad/trunk/src/tclscripts/mged/pattern.tcl: include DEG2RAD in a global declaration |
| 18:39.52 | Notify | 03BRL-CAD:carlmoore * 54473 brlcad/trunk/src/tclscripts/mged/pattern.tcl: oops, had to put in RAD2DEG too |