World: r4wp
[!REBOL3] General discussion about REBOL 3
older newer | first last |
Andreas 10-Mar-2013 [1628] | http://issue.cc/r3/1992- BROWSE doesn't work on OSX |
MarcS 10-Mar-2013 [1629x2] | Great. |
So should I submit pull requests referencing these tickets? | |
Andreas 10-Mar-2013 [1631] | Squash the two 1992-related commits into one, and also mention the CureCode ticket in the commit message (something like "This fixes CureCode issue #1992.") and submit a pull for that. |
MarcS 10-Mar-2013 [1632] | To squash I need to rebase locally then repush? |
Andreas 10-Mar-2013 [1633] | Yes, exactly (push --force). |
MarcS 10-Mar-2013 [1634] | Okay |
BrianH 10-Mar-2013 [1635] | For #1991 se need a better approach. We aren't at the point where we would need to disable a feature while we wait to figure it out, at least for something you have to explicitly call. |
Andreas 10-Mar-2013 [1636] | Hope you don't mind the cosmetics :) |
MarcS 10-Mar-2013 [1637] | Andreas: np, just testing the squashed changeset |
Andreas 10-Mar-2013 [1638] | For #1991, we should at least get the crash removed right away. |
MarcS 10-Mar-2013 [1639] | Sufficient detail, https://github.com/rebol/r3/pull/101? |
Andreas 10-Mar-2013 [1640] | Looks good. |
MarcS 10-Mar-2013 [1641] | https://github.com/rebol/r3/pull/102 |
Andreas 10-Mar-2013 [1642x3] | Let's hope Haiku has fork/exec :) |
Again, the second pull won't fly as-is. | |
If you can isolate the unset changes alone, that'd be great. | |
MarcS 10-Mar-2013 [1645x2] | Np. |
I figured I might as well submit the request so the code is more visible. | |
Andreas 10-Mar-2013 [1647] | Okay, that's fine, thanks. Just to have expectations aligned :) |
MarcS 10-Mar-2013 [1648] | Meanwhile I might merge that fix into my browse-macosx branch. |
Andreas 10-Mar-2013 [1649] | Just don't push the merged branch to Github again, as this will also affect the pull request. |
MarcS 10-Mar-2013 [1650x3] | Oh, right |
A third browse branch it is! | |
(As you might have gathered, I'm not much of a Githubber) | |
Andreas 10-Mar-2013 [1653] | For NONE I see the following options to fix the crash right away: either remove the NONE feature altogether (removing functionality that currently sometimes works on Win32), or use http:// on POSIX (as a not totally reliable workaround), or move the early exit to the POSIX specific code (creating a cross-platform incompatibility between Win32 and POSIX platforms). |
MarcS 10-Mar-2013 [1654x2] | Re: Haiku, http://code.metager.de/source/xref/haiku/headers/posix/unistd.h#212 |
Anyway, the subtree is named 'posix' :) | |
Andreas 10-Mar-2013 [1656] | Good, thanks for looking that up. I can try building on Haiku later on. |
MarcS 10-Mar-2013 [1657x2] | Great |
Git question: can I ignore changes to makefile without modifying .gitignore? | |
Andreas 10-Mar-2013 [1659] | With how the repository is currently set up: I don't know of a way how to do that. Just don't add the makefile changes before you commit. |
MarcS 10-Mar-2013 [1660x3] | Sure, I'm not staging them. |
I seem to recall that there's a global ignore setting | |
(Which I'd likely be abusing, but might be suitable.) | |
Andreas 10-Mar-2013 [1663x2] | I don't think that comes into play with files already present in the repo. |
.git/info/exclude is a per-repository ignore list. | |
MarcS 10-Mar-2013 [1665x2] | Aha, thanks |
Just found that https://help.github.com/articles/ignoring-fileshere | |
Andreas 10-Mar-2013 [1667] | Cool. So --assume-unchanged helps :) git update-index --assume-unchanged make/makefile |
MarcS 10-Mar-2013 [1668x2] | Oh good stuff -- the exclude list doesn't |
Since already committed | |
Andreas 10-Mar-2013 [1670] | Hopefully one remembers having marked a file with --assume-unchanged when actually _trying_ to stage changes from that file :) |
MarcS 10-Mar-2013 [1671x5] | $ git ls-files -v | grep "^[a-z]" h make/makefile |
aha, http://durdn.com/blog/2012/11/22/must-have-git-aliases-advanced-examples/ | |
nice aliases | |
including unasumeall | |
This SO chat seems quite nice, perhaps I should sign up. The interleaving of CureCode and Github feeds works well. | |
Andreas 10-Mar-2013 [1676] | That's pretty nice, yes :) |
MarcS 10-Mar-2013 [1677] | Incidentally, nice to (re)meet you. |
older newer | first last |